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 0A4D241D52 for ; Thu, 23 Feb 2023 16:08:19 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 62F65432A0; Thu, 23 Feb 2023 16:08:18 +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 78F0A43297 for ; Thu, 23 Feb 2023 16:08:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677164897; 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=1EJ5DyDLgoW+lKFUrQw6asI/07rV77Jwg+ZsTlPJ2Xc=; b=L1scymx0B02OsBFEoQ6X/vttDCuWlchsigotDdkb3O7Fzqoo1AlskXmOxOZ4XsAcv/s0UK TP+NHqqoQCKbOF3m7emZhuwYoh1ZcOWUqLf5ztpmBcgvV8ipsLS4hOU3zccxNHhYuHcBWb UWbPcxe+zB72+M3MINVkRF7dVn3o2Go= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [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-471-If96tBIWNnuBXirlCgtAOA-1; Thu, 23 Feb 2023 10:08:15 -0500 X-MC-Unique: If96tBIWNnuBXirlCgtAOA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CA1283C0E461; Thu, 23 Feb 2023 15:08:11 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8CF3F2166B29; Thu, 23 Feb 2023 15:08:10 +0000 (UTC) From: Kevin Traynor To: Ivan Malov Cc: Viacheslav Galaktionov , Andy Moreton , Andrew Rybchenko , dpdk stable Subject: patch 'net/sfc: fix MAC address entry leak in transfer flow parsing' has been queued to stable release 21.11.4 Date: Thu, 23 Feb 2023 15:06:00 +0000 Message-Id: <20230223150631.723699-69-ktraynor@redhat.com> In-Reply-To: <20230223150631.723699-1-ktraynor@redhat.com> References: <20230223150631.723699-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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.4 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/28/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/ef7d2f34a751b11df520655c6a29aa84ca7e8d71 Thanks. Kevin --- >From ef7d2f34a751b11df520655c6a29aa84ca7e8d71 Mon Sep 17 00:00:00 2001 From: Ivan Malov Date: Tue, 14 Feb 2023 17:06:59 +0400 Subject: [PATCH] net/sfc: fix MAC address entry leak in transfer flow parsing [ upstream commit 97f7e36ad946986a14903db68b6770aacaf53ae1 ] When the action parsing helper discovers it can "attach" to an existing action set, it must invoke "delete" on the MAC address(es) that it has "attached" to during parsing. That is because the action set itself (i.e. not the flow rule entry) holds a reference of the address(es). Fixes: 4c6005999e41 ("net/sfc: support MAC address edits in transfer flows") Signed-off-by: Ivan Malov Reviewed-by: Viacheslav Galaktionov Reviewed-by: Andy Moreton Acked-by: Andrew Rybchenko --- drivers/net/sfc/sfc_mae.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c index b34c9afd5b..e8ef844427 100644 --- a/drivers/net/sfc/sfc_mae.c +++ b/drivers/net/sfc/sfc_mae.c @@ -4147,4 +4147,6 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa, spec_mae->action_set = sfc_mae_action_set_attach(sa, &ctx); if (spec_mae->action_set != NULL) { + sfc_mae_mac_addr_del(sa, ctx.src_mac); + sfc_mae_mac_addr_del(sa, ctx.dst_mac); sfc_mae_encap_header_del(sa, ctx.encap_header); efx_mae_action_set_spec_fini(sa->nic, ctx.spec); -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 14:46:25.472971353 +0000 +++ 0069-net-sfc-fix-MAC-address-entry-leak-in-transfer-flow-.patch 2023-02-23 14:46:23.828236168 +0000 @@ -1 +1 @@ -From 97f7e36ad946986a14903db68b6770aacaf53ae1 Mon Sep 17 00:00:00 2001 +From ef7d2f34a751b11df520655c6a29aa84ca7e8d71 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 97f7e36ad946986a14903db68b6770aacaf53ae1 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index aab697b204..c254562696 100644 +index b34c9afd5b..e8ef844427 100644 @@ -27 +28 @@ -@@ -3913,4 +3913,6 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa, +@@ -4147,4 +4147,6 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa,