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 D915BA034F for ; Tue, 1 Mar 2022 11:44:46 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D403F426E6; Tue, 1 Mar 2022 11:44:46 +0100 (CET) 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 2134B426E1 for ; Tue, 1 Mar 2022 11:44:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131485; 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=OjFJ46xQF1Te9fZ9d/xixrjVDt7WJH/jvYdSU6dXIk0=; b=RTTOvjEMuifOLq3B/XAZxixwp5c8YcIk96/zHmfbDZoS4G3UkcBsuo4Xf/614XwlM7MX7S lOTeBMp5TVAN3CWAX4vtFwI2tiXnc7d+9nhkQCYWe/XB+mLmEaetzIW+lNPwgsomS/sqe0 l2X1gKdHvWG9V0VnP0aUK+kyrGOrdy0= 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-328-hVwoG0ohOKuSW5uiTsgUng-1; Tue, 01 Mar 2022 05:44:42 -0500 X-MC-Unique: hVwoG0ohOKuSW5uiTsgUng-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B743451DC; Tue, 1 Mar 2022 10:44:41 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id AC591752BE; Tue, 1 Mar 2022 10:44:40 +0000 (UTC) From: Kevin Traynor To: Satheesh Paul Cc: Jerin Jacob , dpdk stable Subject: patch 'common/cnxk: fix flow deletion' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:42:01 +0000 Message-Id: <20220301104300.334382-45-ktraynor@redhat.com> In-Reply-To: <20220301104300.334382-1-ktraynor@redhat.com> References: <20220301104300.334382-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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 03/06/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/d91869302fa2f79eefbc0ce02d52de54fdcd55de Thanks. Kevin --- >From d91869302fa2f79eefbc0ce02d52de54fdcd55de Mon Sep 17 00:00:00 2001 From: Satheesh Paul Date: Tue, 25 Jan 2022 09:45:26 +0530 Subject: [PATCH] common/cnxk: fix flow deletion [ upstream commit 40257b81b8ae239c630e27cfa81e136ad3a25dc3 ] When a flow is deleted, the counters are deleted without being cleared first. This results in counter values being retained and shown in flows created later. Hence, counter is cleared before being deleted. Updated driver to clear and delete counters upon flow deletion. Fixes: a07f7ced436d ("common/cnxk: add NPC init and fini") Signed-off-by: Satheesh Paul Reviewed-by: Jerin Jacob --- drivers/common/cnxk/roc_npc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/common/cnxk/roc_npc.c b/drivers/common/cnxk/roc_npc.c index 503c74748f..8386e0e956 100644 --- a/drivers/common/cnxk/roc_npc.c +++ b/drivers/common/cnxk/roc_npc.c @@ -1247,4 +1247,14 @@ roc_npc_flow_destroy(struct roc_npc *roc_npc, struct roc_npc_flow *flow) } + if (flow->ctr_id != NPC_COUNTER_NONE) { + rc = roc_npc_mcam_clear_counter(roc_npc, flow->ctr_id); + if (rc != 0) + return rc; + + rc = npc_mcam_free_counter(npc, flow->ctr_id); + if (rc != 0) + return rc; + } + rc = npc_mcam_free_entry(npc, flow->mcam_id); if (rc != 0) -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:02.527405706 +0000 +++ 0045-common-cnxk-fix-flow-deletion.patch 2022-03-01 10:41:01.325244102 +0000 @@ -1 +1 @@ -From 40257b81b8ae239c630e27cfa81e136ad3a25dc3 Mon Sep 17 00:00:00 2001 +From d91869302fa2f79eefbc0ce02d52de54fdcd55de Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 40257b81b8ae239c630e27cfa81e136ad3a25dc3 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index e3961bfbc6..df3016f538 100644 +index 503c74748f..8386e0e956 100644 @@ -26 +27 @@ -@@ -1260,4 +1260,14 @@ roc_npc_flow_destroy(struct roc_npc *roc_npc, struct roc_npc_flow *flow) +@@ -1247,4 +1247,14 @@ roc_npc_flow_destroy(struct roc_npc *roc_npc, struct roc_npc_flow *flow)