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 8B9AEA034E for ; Mon, 21 Feb 2022 16:37:58 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 83F3B4013F; Mon, 21 Feb 2022 16:37:58 +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 40EAE40E5A for ; Mon, 21 Feb 2022 16:37:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645457875; 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=d0t1Mq8RW7iqLqqfmfhTKJ3MjHiidc1cXcNgCHpChTE=; b=hzDymvFBjVmbRImAtkOrtPi5d/KbplPuSp0RioQ2xhFFL58Et0F86ndlENxhLiLVAV468s HVINGTJ/Fgn1uuZ+guLXSaZ0r+o9/o/QVIefQWzr0kcfCXvBa+AqKkP2xX/CF1/O17RXbg KrqvpyKo4Cnp6k/yd5hhymsdF4S8Pf8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-425-P2D-x68TNDeqNFSaxPHy3A-1; Mon, 21 Feb 2022 10:37:53 -0500 X-MC-Unique: P2D-x68TNDeqNFSaxPHy3A-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5517A100C661; Mon, 21 Feb 2022 15:37:52 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2AB927E131; Mon, 21 Feb 2022 15:37:50 +0000 (UTC) From: Kevin Traynor To: Satheesh Paul Cc: Jerin Jacob , dpdk stable Subject: patch 'common/cnxk: fix nibble parsing order when dumping MCAM' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:33:42 +0000 Message-Id: <20220221153625.152324-33-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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" 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/26/22. 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/9ff875ecff4db358371c856592c6b2fed6a18ef7 Thanks. Kevin --- >From 9ff875ecff4db358371c856592c6b2fed6a18ef7 Mon Sep 17 00:00:00 2001 From: Satheesh Paul Date: Wed, 24 Nov 2021 13:25:27 +0530 Subject: [PATCH] common/cnxk: fix nibble parsing order when dumping MCAM [ upstream commit 0ed49186793742b89a30c35f141d833501de5661 ] Fix the order in which layer flags and layer type fields are parsed when dumping the MCAM data. Fixes: 9869c39918a0 ("common/cnxk: support flow entry dump") Signed-off-by: Satheesh Paul Acked-by: Jerin Jacob --- drivers/common/cnxk/roc_npc_mcam_dump.c | 40 ++++++++++++------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/drivers/common/cnxk/roc_npc_mcam_dump.c b/drivers/common/cnxk/roc_npc_mcam_dump.c index 19b4901a52..278056591e 100644 --- a/drivers/common/cnxk/roc_npc_mcam_dump.c +++ b/drivers/common/cnxk/roc_npc_mcam_dump.c @@ -160,4 +160,10 @@ npc_flow_print_parse_nibbles(FILE *file, struct roc_npc_flow *flow, } + if (rx_parse->laflags) { + data = npc_get_nibbles(flow, 2, offset); + fprintf(file, "\tNPC_PARSE_NIBBLE_LA_FLAGS:%#02X\n", data); + offset += 8; + } + if (rx_parse->latype) { data = npc_get_nibbles(flow, 1, offset); @@ -167,7 +173,7 @@ npc_flow_print_parse_nibbles(FILE *file, struct roc_npc_flow *flow, } - if (rx_parse->laflags) { + if (rx_parse->lbflags) { data = npc_get_nibbles(flow, 2, offset); - fprintf(file, "\tNPC_PARSE_NIBBLE_LA_FLAGS:%#02X\n", data); + fprintf(file, "\tNPC_PARSE_NIBBLE_LB_FLAGS:%#02X\n", data); offset += 8; } @@ -180,7 +186,7 @@ npc_flow_print_parse_nibbles(FILE *file, struct roc_npc_flow *flow, } - if (rx_parse->lbflags) { + if (rx_parse->lcflags) { data = npc_get_nibbles(flow, 2, offset); - fprintf(file, "\tNPC_PARSE_NIBBLE_LB_FLAGS:%#02X\n", data); + fprintf(file, "\tNPC_PARSE_NIBBLE_LC_FLAGS:%#02X\n", data); offset += 8; } @@ -193,7 +199,7 @@ npc_flow_print_parse_nibbles(FILE *file, struct roc_npc_flow *flow, } - if (rx_parse->lcflags) { + if (rx_parse->ldflags) { data = npc_get_nibbles(flow, 2, offset); - fprintf(file, "\tNPC_PARSE_NIBBLE_LC_FLAGS:%#02X\n", data); + fprintf(file, "\tNPC_PARSE_NIBBLE_LD_FLAGS:%#02X\n", data); offset += 8; } @@ -206,7 +212,7 @@ npc_flow_print_parse_nibbles(FILE *file, struct roc_npc_flow *flow, } - if (rx_parse->ldflags) { + if (rx_parse->leflags) { data = npc_get_nibbles(flow, 2, offset); - fprintf(file, "\tNPC_PARSE_NIBBLE_LD_FLAGS:%#02X\n", data); + fprintf(file, "\tNPC_PARSE_NIBBLE_LE_FLAGS:%#02X\n", data); offset += 8; } @@ -219,7 +225,7 @@ npc_flow_print_parse_nibbles(FILE *file, struct roc_npc_flow *flow, } - if (rx_parse->leflags) { + if (rx_parse->lfflags) { data = npc_get_nibbles(flow, 2, offset); - fprintf(file, "\tNPC_PARSE_NIBBLE_LE_FLAGS:%#02X\n", data); + fprintf(file, "\tNPC_PARSE_NIBBLE_LF_FLAGS:%#02X\n", data); offset += 8; } @@ -232,7 +238,7 @@ npc_flow_print_parse_nibbles(FILE *file, struct roc_npc_flow *flow, } - if (rx_parse->lfflags) { + if (rx_parse->lgflags) { data = npc_get_nibbles(flow, 2, offset); - fprintf(file, "\tNPC_PARSE_NIBBLE_LF_FLAGS:%#02X\n", data); + fprintf(file, "\tNPC_PARSE_NIBBLE_LG_FLAGS:%#02X\n", data); offset += 8; } @@ -245,8 +251,7 @@ npc_flow_print_parse_nibbles(FILE *file, struct roc_npc_flow *flow, } - if (rx_parse->lgflags) { + if (rx_parse->lhflags) { data = npc_get_nibbles(flow, 2, offset); - fprintf(file, "\tNPC_PARSE_NIBBLE_LG_FLAGS:%#02X\n", data); - offset += 8; + fprintf(file, "\tNPC_PARSE_NIBBLE_LH_FLAGS:%#02X\n", data); } @@ -257,9 +262,4 @@ npc_flow_print_parse_nibbles(FILE *file, struct roc_npc_flow *flow, offset += 4; } - - if (rx_parse->lhflags) { - data = npc_get_nibbles(flow, 2, offset); - fprintf(file, "\tNPC_PARSE_NIBBLE_LH_FLAGS:%#02X\n", data); - } } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:45.376738170 +0000 +++ 0033-common-cnxk-fix-nibble-parsing-order-when-dumping-MC.patch 2022-02-21 15:22:44.073704085 +0000 @@ -1 +1 @@ -From 0ed49186793742b89a30c35f141d833501de5661 Mon Sep 17 00:00:00 2001 +From 9ff875ecff4db358371c856592c6b2fed6a18ef7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0ed49186793742b89a30c35f141d833501de5661 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org