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 25A634326F for ; Thu, 2 Nov 2023 14:14:19 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 12AA842DFC; Thu, 2 Nov 2023 14:14:19 +0100 (CET) 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 DC9B642DE6 for ; Thu, 2 Nov 2023 14:14:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930857; 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=AHARsW1SYbtrcxjLkbPXhWyxAcL5Bwq1Xm0W6uZ75g8=; b=bRSGgX8KsrzEghx/kexDqM/SOJxh9Wo17hN9I1Ya42eBAwRg3ZDdl0xLg6Dz/DVx2dKO9W vxeDRfMNEYBe/dq6hUvTI5fhbvxjz+OZnE4Hp2DBznVBcAJAMqs6jyE0mic/3oa+Pb7H7u JQ6ULBlOv1PmvMk+CPw6Vu3+yzHIJQ8= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-63-fSMPM5SzODenDMy3tl5qoA-1; Thu, 02 Nov 2023 09:14:14 -0400 X-MC-Unique: fSMPM5SzODenDMy3tl5qoA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2FD8D811E8D; Thu, 2 Nov 2023 13:14:14 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 581E8492BFA; Thu, 2 Nov 2023 13:14:13 +0000 (UTC) From: Kevin Traynor To: Harman Kalra Cc: Ashwin Sekhar T K , dpdk stable Subject: patch 'mempool/cnxk: fix free from non-EAL threads' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:11:54 +0000 Message-ID: <20231102131254.315947-48-ktraynor@redhat.com> In-Reply-To: <20231102131254.315947-1-ktraynor@redhat.com> References: <20231102131254.315947-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.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.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 11/08/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/5bbab978092b6753c0dcec94bb2c07ae70a7b014 Thanks. Kevin --- >From 5bbab978092b6753c0dcec94bb2c07ae70a7b014 Mon Sep 17 00:00:00 2001 From: Harman Kalra Date: Tue, 22 Aug 2023 22:31:56 +0530 Subject: [PATCH] mempool/cnxk: fix free from non-EAL threads [ upstream commit e97668dd1e34c7049a7a568bb945f739d7eff9da ] For non-EAL pthreads, rte_lcore_id() will not be valid. So, batch free cannot be used as those threads won't have dedicated lmtlines. So, fallback to bulk alloc in such cases. Fixes: ecbc731a2286 ("mempool/cnxk: add cn10k batch enqueue") Signed-off-by: Harman Kalra Signed-off-by: Ashwin Sekhar T K --- drivers/mempool/cnxk/cn10k_mempool_ops.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/mempool/cnxk/cn10k_mempool_ops.c b/drivers/mempool/cnxk/cn10k_mempool_ops.c index 6ebbf91de5..55ebd6bfeb 100644 --- a/drivers/mempool/cnxk/cn10k_mempool_ops.c +++ b/drivers/mempool/cnxk/cn10k_mempool_ops.c @@ -145,4 +145,10 @@ cn10k_mempool_enq(struct rte_mempool *mp, void *const *obj_table, rte_io_wmb(); + /* For non-EAL threads, rte_lcore_id() will not be valid. Hence + * fallback to bulk alloc + */ + if (unlikely(rte_lcore_id() == LCORE_ID_ANY)) + return cnxk_mempool_enq(mp, obj_table, n); + if (n == 1) { roc_npa_aura_op_free(mp->pool_id, 1, ptr[0]); -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-02 13:09:42.007667831 +0000 +++ 0048-mempool-cnxk-fix-free-from-non-EAL-threads.patch 2023-11-02 13:09:40.847163445 +0000 @@ -1 +1 @@ -From e97668dd1e34c7049a7a568bb945f739d7eff9da Mon Sep 17 00:00:00 2001 +From 5bbab978092b6753c0dcec94bb2c07ae70a7b014 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e97668dd1e34c7049a7a568bb945f739d7eff9da ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 41b755b52b..2e46204c8d 100644 +index 6ebbf91de5..55ebd6bfeb 100644 @@ -23 +24 @@ -@@ -163,4 +163,10 @@ cn10k_mempool_enq(struct rte_mempool *mp, void *const *obj_table, +@@ -145,4 +145,10 @@ cn10k_mempool_enq(struct rte_mempool *mp, void *const *obj_table,