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 9EB65A054A for ; Tue, 25 Oct 2022 17:08:44 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9A4A442C3C; Tue, 25 Oct 2022 17:08:44 +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 3F48442C48 for ; Tue, 25 Oct 2022 17:08:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710519; 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=SgsDCfg8MgNL9iGev4kLBFWDnTn1n9ovnGhBpRccdOo=; b=d/KtpyvVF9AhmBOPx9YgaYNWsZEDYbc9tScyDHwLHj5qf8EPL6fY47wSSlzicvhxynn8Vn TDbvSoJGLTZPzv9NK78daoLQJf4IoUo3gIyaznw7OhriayUxLVRrnuWgfPTlwoSlk9Znzr ec96oxjx0jf4fpbi1T/gwNYyO8WHu5M= 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-61-nmxSw_b4NNO3uUs0yVgmFQ-1; Tue, 25 Oct 2022 11:08:33 -0400 X-MC-Unique: nmxSw_b4NNO3uUs0yVgmFQ-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AAF2B86C165; Tue, 25 Oct 2022 15:08:31 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id A02FD4A9254; Tue, 25 Oct 2022 15:08:30 +0000 (UTC) From: Kevin Traynor To: Satheesh Paul Cc: Kiran Kumar K , dpdk stable Subject: patch 'common/cnxk: fix missing flow counter reset' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:06:19 +0100 Message-Id: <20221025150734.142189-24-ktraynor@redhat.com> In-Reply-To: <20221025150734.142189-1-ktraynor@redhat.com> References: <20221025150734.142189-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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.3 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/01/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/97083f144ce0df4a66c56c5c6b38113e3303972e Thanks. Kevin --- >From 97083f144ce0df4a66c56c5c6b38113e3303972e Mon Sep 17 00:00:00 2001 From: Satheesh Paul Date: Tue, 13 Sep 2022 10:40:19 +0530 Subject: [PATCH] common/cnxk: fix missing flow counter reset [ upstream commit b494807269c077ee82fc210e00da0e4e1121c5b8 ] Added code to clear counters upon flow deletion. Fixes: f9af9080746 ("common/cnxk: add mcam utility API") Signed-off-by: Satheesh Paul Reviewed-by: Kiran Kumar K --- drivers/common/cnxk/roc_npc_mcam.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/common/cnxk/roc_npc_mcam.c b/drivers/common/cnxk/roc_npc_mcam.c index a16ba3f7be..eb0a982589 100644 --- a/drivers/common/cnxk/roc_npc_mcam.c +++ b/drivers/common/cnxk/roc_npc_mcam.c @@ -712,6 +712,8 @@ npc_flow_free_all_resources(struct npc *npc) while ((flow = TAILQ_FIRST(&npc->flow_list[idx])) != NULL) { npc_rss_group_free(npc, flow); - if (flow->ctr_id != NPC_COUNTER_NONE) + if (flow->ctr_id != NPC_COUNTER_NONE) { + rc |= npc_mcam_clear_counter(npc, flow->ctr_id); rc |= npc_mcam_free_counter(npc, flow->ctr_id); + } npc_delete_prio_list_entry(npc, flow); -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:18:59.102948230 +0100 +++ 0024-common-cnxk-fix-missing-flow-counter-reset.patch 2022-10-25 14:18:58.379797976 +0100 @@ -1 +1 @@ -From b494807269c077ee82fc210e00da0e4e1121c5b8 Mon Sep 17 00:00:00 2001 +From 97083f144ce0df4a66c56c5c6b38113e3303972e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b494807269c077ee82fc210e00da0e4e1121c5b8 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 245eeb0107..b067dc4b91 100644 +index a16ba3f7be..eb0a982589 100644 @@ -21 +22 @@ -@@ -867,6 +867,8 @@ npc_flow_free_all_resources(struct npc *npc) +@@ -712,6 +712,8 @@ npc_flow_free_all_resources(struct npc *npc)