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 7BFDFA0C41 for ; Tue, 30 Nov 2021 17:37:21 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 767FA41142; Tue, 30 Nov 2021 17:37:21 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 0F93A410F7 for ; Tue, 30 Nov 2021 17:37:20 +0100 (CET) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id D53853F1B1 for ; Tue, 30 Nov 2021 16:37:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290239; bh=i4zNBp1Xhj0g9d2S9etEXRD7cguc1OJgoMv9Z4OVWf8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=hf5OMP5HPfeIOmXvMNz5E3QDmQOx2ns73q8fKSWvqHJwJ0ld3uFz0BoAgv7C7SKuc eQDf5PWunoumTwZmwieBKttWVZ0He4Z6FU7Olaz2HUn13tPjUM92eP2cr0iFduQIcs l/NkYbuvXs/VCVj3jb2apxzLdusd3Oi8J4sp9kGhOUPGB5A9aChaH/vrQxSCUp4O2x fqJXjkHYE9knbGiBwe0oE/N+psKyc7mZe5DJiMprhQaB//lDNwa8IiTctSCEuJGEpH lu2+DM0tw8//qyD091ZpoSUCzWymSMaBYWkVk1MKokAGXB3cjCnTSmyKRIvoSCyTGl nFd8+rSVgnL9g== Received: by mail-ed1-f71.google.com with SMTP id bx28-20020a0564020b5c00b003e7c42443dbso17399610edb.15 for ; Tue, 30 Nov 2021 08:37:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=i4zNBp1Xhj0g9d2S9etEXRD7cguc1OJgoMv9Z4OVWf8=; b=i5NEe7bWhr7vcmkT5IKL8lOPNnH5LmCSx7fk74qkCjvm7qcka+x5pi5VknSM7Ysxfv 3TcZ4/yUnueii/XBnLjLYsY1fz1lCgq4+KIEaDjjYRXL3XoKJzdLX4iJYpCvDeXoT+Sr TsTb8iJn/tXBlKS4KESDgH84Kb5idoyIRlClLcyFFY9K5Y8imEErGlNL/TM++PB296lP WRxiiSSiQQoSL9GzUrQjgYmdSSqkeSjGOdOBDgNIe8YxrcoZNAJ7LVOGUMvy2r9QTjNZ f5FEGDwyj93eIS9NrulgrrOBl0EHQ/41LX00SDWygtpDVc9Hqw2ottvx+m7lTnJUWV8D W+Mg== X-Gm-Message-State: AOAM532ZC2oyJWp3NFR1YgfsRo1zjg1+sODddVmo1EFDcBmlP5p4Z16T 3lOCzMGN767Wddw9kg0phrLl50QhPfYlhvOERG31rsHWCDZ5q4hWNgdXcr6iqEYHJaJDB9gdpzY qQ2A1U2Yyzqxjns/xI6Poq2xd X-Received: by 2002:a17:906:c7c9:: with SMTP id dc9mr255910ejb.34.1638290239522; Tue, 30 Nov 2021 08:37:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJyetbYN+IkcK3LjA6RGL8vJZhSJxnJbA4aWKcTgzkWwrQ1rCInCdRrzemSiAplEsp13nQJ4Lg== X-Received: by 2002:a17:906:c7c9:: with SMTP id dc9mr255888ejb.34.1638290239377; Tue, 30 Nov 2021 08:37:19 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id a13sm8722422edk.29.2021.11.30.08.37.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:37:18 -0800 (PST) From: christian.ehrhardt@canonical.com To: Qiming Chen Cc: Qi Zhang , dpdk stable Subject: patch 'net/ixgbe: fix hash handle leak' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:33:45 +0100 Message-Id: <20211130163605.2460997-21-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.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 19.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/61e898b734e61a692e2cc7c95d2c80a312308e36 Thanks. Christian Ehrhardt --- >From 61e898b734e61a692e2cc7c95d2c80a312308e36 Mon Sep 17 00:00:00 2001 From: Qiming Chen Date: Tue, 31 Aug 2021 21:24:07 +0800 Subject: [PATCH] net/ixgbe: fix hash handle leak [ upstream commit 03f83d6c5c9f9d30ef2cd7c2b0fe5d86935cd372 ] In the ixgbe_fdir_filter_init and ixgbe_l2_tn_filter_init functions, after the hash handle is created, the handle is not released in subsequent abnormal branches. Fixes: 080e3c0ee989 ("net/ixgbe: store flow director filter") Fixes: d0c0c416ef1f ("net/ixgbe: store L2 tunnel filter") Signed-off-by: Qiming Chen Acked-by: Qi Zhang --- drivers/net/ixgbe/ixgbe_ethdev.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 8ec0c76351..0b6a6845a4 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -1439,6 +1439,7 @@ static int ixgbe_fdir_filter_init(struct rte_eth_dev *eth_dev) if (!fdir_info->hash_map) { PMD_INIT_LOG(ERR, "Failed to allocate memory for fdir hash map!"); + rte_hash_free(fdir_info->hash_handle); return -ENOMEM; } fdir_info->mask_added = FALSE; @@ -1475,6 +1476,7 @@ static int ixgbe_l2_tn_filter_init(struct rte_eth_dev *eth_dev) if (!l2_tn_info->hash_map) { PMD_INIT_LOG(ERR, "Failed to allocate memory for L2 TN hash map!"); + rte_hash_free(l2_tn_info->hash_handle); return -ENOMEM; } l2_tn_info->e_tag_en = FALSE; -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:07.340357497 +0100 +++ 0021-net-ixgbe-fix-hash-handle-leak.patch 2021-11-30 16:50:05.574871945 +0100 @@ -1 +1 @@ -From 03f83d6c5c9f9d30ef2cd7c2b0fe5d86935cd372 Mon Sep 17 00:00:00 2001 +From 61e898b734e61a692e2cc7c95d2c80a312308e36 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 03f83d6c5c9f9d30ef2cd7c2b0fe5d86935cd372 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 3cd2a094ae..7b198d95c2 100644 +index 8ec0c76351..0b6a6845a4 100644 @@ -24 +25 @@ -@@ -1393,6 +1393,7 @@ static int ixgbe_fdir_filter_init(struct rte_eth_dev *eth_dev) +@@ -1439,6 +1439,7 @@ static int ixgbe_fdir_filter_init(struct rte_eth_dev *eth_dev) @@ -32 +33 @@ -@@ -1429,6 +1430,7 @@ static int ixgbe_l2_tn_filter_init(struct rte_eth_dev *eth_dev) +@@ -1475,6 +1476,7 @@ static int ixgbe_l2_tn_filter_init(struct rte_eth_dev *eth_dev)