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 8D45842ECF for ; Thu, 20 Jul 2023 17:40:01 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 89A4C40685; Thu, 20 Jul 2023 17:40:01 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id CB612400D6 for ; Thu, 20 Jul 2023 17:40:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689867600; 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=A0tWGlNvFQIDc+6+HYiAbbpXCM6u9fi5hWmKdErUAbo=; b=SDfKevFWeDbgTRmD4dXoBlfxmmfbvKHWUdIjxNIS66iCxZ4+y00sVoV+ScAHiGjkMYpPQa 2IpMFbmIRk2qtFXGX1H2ASmfZGe4d7VswB28VLe3TPmiO4Tt0nFNCKXZ/hkfdLI5nUDEou 7zo6AyP/A2zkXRj8xV9nBeO60/A+T/A= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-7-fc13gbjmMmG6MECiF_FJCw-1; Thu, 20 Jul 2023 11:23:42 -0400 X-MC-Unique: fc13gbjmMmG6MECiF_FJCw-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 9A85D3C165AA; Thu, 20 Jul 2023 15:23:07 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 90775492C13; Thu, 20 Jul 2023 15:23:06 +0000 (UTC) From: Kevin Traynor To: Sean Zhang Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix flow dump for modify field' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:19:16 +0100 Message-ID: <20230720151942.262154-125-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/0c6a5cac3199c7db4a8f9f60cd265ced01322695 Thanks. Kevin --- >From 0c6a5cac3199c7db4a8f9f60cd265ced01322695 Mon Sep 17 00:00:00 2001 From: Sean Zhang Date: Thu, 29 Jun 2023 13:00:44 +0300 Subject: [PATCH] net/mlx5: fix flow dump for modify field [ upstream commit faecafc16f69c559323ec46ef110a771ce0bd7fb ] When using other process to dump flow information, the modify field information cannot be dumpped due to incorrect lcore value. Add loop to get modify field information from all lcore to fix the issue. Fixes: a7ac7fae4919 ("net/mlx5: enhance flow dump") Signed-off-by: Sean Zhang Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow.c | 56 +++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 16 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 1e147c2e0d..192e2d7718 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -8639,21 +8639,45 @@ mlx5_flow_dev_dump_sh_all(struct rte_eth_dev *dev, i = lcore_index; - for (j = 0; j <= h->mask; j++) { - l_inconst = &h->buckets[j].l; - if (!l_inconst || !l_inconst->cache[i]) - continue; + if (lcore_index == MLX5_LIST_NLCORE) { + for (i = 0; i <= (uint32_t)lcore_index; i++) { + for (j = 0; j <= h->mask; j++) { + l_inconst = &h->buckets[j].l; + if (!l_inconst || !l_inconst->cache[i]) + continue; - e = LIST_FIRST(&l_inconst->cache[i]->h); - while (e) { - modify_hdr = - (struct mlx5_flow_dv_modify_hdr_resource *)e; - data = (const uint8_t *)modify_hdr->actions; - size = (size_t)(modify_hdr->actions_num) * 8; - actions_num = modify_hdr->actions_num; - id = (uint64_t)(uintptr_t)modify_hdr->action; - type = DR_DUMP_REC_TYPE_PMD_MODIFY_HDR; - save_dump_file(data, size, type, id, - (void *)(&actions_num), file); - e = LIST_NEXT(e, next); + e = LIST_FIRST(&l_inconst->cache[i]->h); + while (e) { + modify_hdr = + (struct mlx5_flow_dv_modify_hdr_resource *)e; + data = (const uint8_t *)modify_hdr->actions; + size = (size_t)(modify_hdr->actions_num) * 8; + actions_num = modify_hdr->actions_num; + id = (uint64_t)(uintptr_t)modify_hdr->action; + type = DR_DUMP_REC_TYPE_PMD_MODIFY_HDR; + save_dump_file(data, size, type, id, + (void *)(&actions_num), file); + e = LIST_NEXT(e, next); + } + } + } + } else { + for (j = 0; j <= h->mask; j++) { + l_inconst = &h->buckets[j].l; + if (!l_inconst || !l_inconst->cache[i]) + continue; + + e = LIST_FIRST(&l_inconst->cache[i]->h); + while (e) { + modify_hdr = + (struct mlx5_flow_dv_modify_hdr_resource *)e; + data = (const uint8_t *)modify_hdr->actions; + size = (size_t)(modify_hdr->actions_num) * 8; + actions_num = modify_hdr->actions_num; + id = (uint64_t)(uintptr_t)modify_hdr->action; + type = DR_DUMP_REC_TYPE_PMD_MODIFY_HDR; + save_dump_file(data, size, type, id, + (void *)(&actions_num), file); + e = LIST_NEXT(e, next); + } } } -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:10.060207514 +0100 +++ 0125-net-mlx5-fix-flow-dump-for-modify-field.patch 2023-07-20 16:17:55.152752513 +0100 @@ -1 +1 @@ -From faecafc16f69c559323ec46ef110a771ce0bd7fb Mon Sep 17 00:00:00 2001 +From 0c6a5cac3199c7db4a8f9f60cd265ced01322695 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit faecafc16f69c559323ec46ef110a771ce0bd7fb ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index cf83db7b60..abb86241fc 100644 +index 1e147c2e0d..192e2d7718 100644 @@ -23 +24 @@ -@@ -10391,21 +10391,45 @@ mlx5_flow_dev_dump_sh_all(struct rte_eth_dev *dev, +@@ -8639,21 +8639,45 @@ mlx5_flow_dev_dump_sh_all(struct rte_eth_dev *dev,