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 1EB44A0C47 for ; Mon, 26 Jul 2021 15:54:57 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0F0FF410F2; Mon, 26 Jul 2021 15:54:57 +0200 (CEST) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mails.dpdk.org (Postfix) with ESMTP id 8B4F940DDA for ; Mon, 26 Jul 2021 15:54:55 +0200 (CEST) Received: by mail-wm1-f44.google.com with SMTP id k14-20020a05600c1c8eb02901f13dd1672aso54525wms.0 for ; Mon, 26 Jul 2021 06:54:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VLfccvplnjW2yBsJ+/qyHjH3vMV3abk6v1HilUxFK4o=; b=t3tw6noARYXR7+cQ6YVdW+Cr22rihFXSLXCbrjZT5lZ7DjM7Y/ZZao6bsE8CW92Pac bw9qLvjAfvgI+k0e2Po9Kd8X9rcygyI3LqCjgZBR8mtV+fPxbmL0wlq9NVSbGUdxRtGb oPZNPZIg6lkj5TmwMOABlxZpgy4maLhDpVuOuJWHiTOpQ0M00X0CrMoVTwwaoTUUakXJ wxPV4rOuK0Hm9sy7UhvRORfXYXlJJUT1b0VhJdlqOl37aSt+KoQFcdP4vp8mAv6/e8y+ SmCoJNw6aC0gxsY2Qv3bVON23pbsXc1qWe08vRx/EpQo46dxQ3SQtbGVwmyxg1p7WZxZ +qKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VLfccvplnjW2yBsJ+/qyHjH3vMV3abk6v1HilUxFK4o=; b=f9YA00mvqKug5UuJ7sgkW1q/po6qs/nU+6OaRDAaHIZjA7xeZffwCsPQmnwe7pW80T i/7q0E2oIC+vY9kF0Wv9VXJ/R1fFu9td6oX/VJoUK2Rzfo8KIkp+2rKurvtaRqQaxSj1 VFGQgnZ/T1d53PetO0AFHCMGaQtwToOIVGHCd3rPHIKwZzTLe4i8L87enEDFrjvjJZo5 NRTtd4PmHnA2z7dZJ9KJ2UhnT5BKHvALdfvneGwqNw5P2gZw4SbmONlZ1rJ2z1l0umfv Nlsb452U8JVLbeTTlg+zgzjkxNB6bR33IVXyN0d3p8cnw45ChhNWPWRfriYmk9B2GRnH 1GyQ== X-Gm-Message-State: AOAM531D1iLa+uWlPyAahGBwB2OKR0Kj76ua57hhb2XkRJhjGXWy3peC dD8WGi4FCfVntvIydWMzQ/Y= X-Google-Smtp-Source: ABdhPJwWflq/NnVta/LacHIV1+NjuabWdUvXxHcRZLqnjsV/S25jwitIalHTzCuzPgBdlDCBUWYyNQ== X-Received: by 2002:a1c:35c2:: with SMTP id c185mr26854373wma.73.1627307693938; Mon, 26 Jul 2021 06:54:53 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id w18sm45366279wrg.68.2021.07.26.06.54.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 06:54:53 -0700 (PDT) From: luca.boccassi@gmail.com To: Michael Baum Cc: Ori Kam , dpdk stable Date: Mon, 26 Jul 2021 14:52:52 +0100 Message-Id: <20210726135322.149850-29-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210726135322.149850-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> <20210726135322.149850-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'regex/mlx5: fix redundancy in device removal' has been queued to stable release 20.11.3 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.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 07/28/21. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/da1a6d5e462d783ca6aaf53ac9b58945d00ea485 Thanks. Luca Boccassi --- >From da1a6d5e462d783ca6aaf53ac9b58945d00ea485 Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Mon, 12 Jul 2021 10:06:44 +0300 Subject: [PATCH] regex/mlx5: fix redundancy in device removal [ upstream commit 34c84ebbbcc8fc71901e17899f1bf1b1ba815084 ] In the removal function, PMD releases all driver resources and cancels the regexdev registry. However, regexdev registration is accidentally canceled twice. Remove one of them. Fixes: b34d816363b5 ("regex/mlx5: support rules import") Signed-off-by: Michael Baum Acked-by: Ori Kam --- drivers/regex/mlx5/mlx5_regex.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/regex/mlx5/mlx5_regex.c b/drivers/regex/mlx5/mlx5_regex.c index 34827fa133..9ec9346a62 100644 --- a/drivers/regex/mlx5/mlx5_regex.c +++ b/drivers/regex/mlx5/mlx5_regex.c @@ -248,8 +248,6 @@ mlx5_regex_pci_remove(struct rte_pci_device *pci_dev) rte_regexdev_unregister(priv->regexdev); if (priv->ctx) mlx5_glue->close_device(priv->ctx); - if (priv->regexdev) - rte_regexdev_unregister(priv->regexdev); rte_free(priv); } return 0; -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-26 13:53:17.337867426 +0100 +++ 0029-regex-mlx5-fix-redundancy-in-device-removal.patch 2021-07-26 13:53:15.857292791 +0100 @@ -1 +1 @@ -From 34c84ebbbcc8fc71901e17899f1bf1b1ba815084 Mon Sep 17 00:00:00 2001 +From da1a6d5e462d783ca6aaf53ac9b58945d00ea485 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 34c84ebbbcc8fc71901e17899f1bf1b1ba815084 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 279b89acc9..f17b6df47f 100644 +index 34827fa133..9ec9346a62 100644 @@ -25 +26 @@ -@@ -282,8 +282,6 @@ mlx5_regex_dev_remove(struct rte_device *rte_dev) +@@ -248,8 +248,6 @@ mlx5_regex_pci_remove(struct rte_pci_device *pci_dev)