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 02704A0543 for ; Sat, 5 Nov 2022 18:13:05 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F2AF342D29; Sat, 5 Nov 2022 18:13:04 +0100 (CET) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mails.dpdk.org (Postfix) with ESMTP id 5743C400D5 for ; Sat, 5 Nov 2022 18:13:04 +0100 (CET) Received: by mail-wm1-f44.google.com with SMTP id ja4-20020a05600c556400b003cf6e77f89cso6665624wmb.0 for ; Sat, 05 Nov 2022 10:13:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UeRpfsNtqw/akaeEdpUtzpVtToJLTOHjFNw9ogrdy8k=; b=o7JClCCS9mAtsz6q8g7MGYQI1FmsaCu+f51M0YbYX6BdRgciWAPVw76HOP0T56vOWB Em+iHUq/wqYqeRW1t2CCl7+/9Ya8xXMEvvOxlkhMJwsKRN+0HypnzuzovYV19WaLZODn P05EwSGMBE1TcWhFLIM84+JdNjC3S1GgLCKV7tZkaWHquqAJjf9BOnUIErf4YSOsl+HV rnUJjjUFpE75K6jAv+iWmps9wstlOkCcqpFGpg6H7xPkjvWZL47cA0WhE9GSOUp9a8nl GsAPEhaphdZvOxzVK3iguwodahtGY2IfKjdZYTtr6aPNSyhA+zgjOupUCvsHtyc/DPJQ 3C0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UeRpfsNtqw/akaeEdpUtzpVtToJLTOHjFNw9ogrdy8k=; b=nmMYt5/xZSeE/24SiDd55kRC1Si2FD20pzIUy0qD7ye7m5fsCB3Bm14GHEVpOOJsFq gdZQPFtuwDsBZUP96pXCPi2OFA+YtPPPXzcExxMaJotblnqhWHyiegiKIeVbhX+ytPmH Od3nywNPFgOZI4ktteFk7ETDWfVAnk9UyAR6d00AyClOblub5CF8Tt60T+2Hq6HtRtTv pqWM8whivnEFSlwaeNI0SdeWKXYIMZpKunWwoGU89e+Z7Zwv1IxC8bOYe7rxyG1YjVsB vVBPUHGyIescknjguEco/g2F+4rvih0BKdX1DhzrMVmpWHZGNF9gg2kP3zrdiN5SICF+ z4qg== X-Gm-Message-State: ACrzQf0Q/0+2LhcMP27PXhzFpL1Pw/We8uEnOFEupQlXaAFuvuJKnUBS ORxmLcs1n5p+90T2seXNLIR1PY1wC3E= X-Google-Smtp-Source: AMsMyM4WpuwQ+1FE0PLpyEej9GcfT0pMcTK/64nT7lL5ooRqEbygbnzptfvJKBdHiJWcz+H+DSf+6Q== X-Received: by 2002:a7b:c047:0:b0:3b4:adc7:1ecb with SMTP id u7-20020a7bc047000000b003b4adc71ecbmr27586226wmc.144.1667668383969; Sat, 05 Nov 2022 10:13:03 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id az2-20020adfe182000000b00226dba960b4sm2736370wrb.3.2022.11.05.10.13.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Nov 2022 10:13:03 -0700 (PDT) From: luca.boccassi@gmail.com To: Dong Zhou Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix thread workspace memory leak' has been queued to stable release 20.11.7 Date: Sat, 5 Nov 2022 17:11:23 +0000 Message-Id: <20221105171146.1520039-24-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221105171146.1520039-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-100-luca.boccassi@gmail.com> <20221105171146.1520039-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.7 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/07/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/afccd451f65904ae301cd15208e09ad51efad352 Thanks. Luca Boccassi --- >From afccd451f65904ae301cd15208e09ad51efad352 Mon Sep 17 00:00:00 2001 From: Dong Zhou Date: Thu, 13 Oct 2022 12:34:02 +0300 Subject: [PATCH] net/mlx5: fix thread workspace memory leak [ upstream commit 4df7f801fff5e4065da5c86ad05df0e48d4d3d6e ] The thread workspace push/pop should be paired. In the "flow_list_create" routine, if error happened the workspace pop was missed. This patch shares the workspace pop for all return paths. Fixes: 0064bf431899 ("net/mlx5: fix nested flow creation") Signed-off-by: Dong Zhou Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 7a149ab761..e22e8f6918 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -5691,8 +5691,8 @@ error: rte_errno = ret; /* Restore rte_errno. */ ret = rte_errno; rte_errno = ret; - mlx5_flow_pop_thread_workspace(); error_before_hairpin_split: + mlx5_flow_pop_thread_workspace(); rte_free(translated_actions); return 0; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-05 17:11:10.764987031 +0000 +++ 0024-net-mlx5-fix-thread-workspace-memory-leak.patch 2022-11-05 17:11:08.662942384 +0000 @@ -1 +1 @@ -From 4df7f801fff5e4065da5c86ad05df0e48d4d3d6e Mon Sep 17 00:00:00 2001 +From afccd451f65904ae301cd15208e09ad51efad352 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4df7f801fff5e4065da5c86ad05df0e48d4d3d6e ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index e4744b0a67..6fb1d53fc5 100644 +index 7a149ab761..e22e8f6918 100644 @@ -23 +24 @@ -@@ -7028,8 +7028,8 @@ error: +@@ -5691,8 +5691,8 @@ error: