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 0E589A0C41 for ; Tue, 30 Nov 2021 17:37:54 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0052941148; Tue, 30 Nov 2021 17:37:53 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id B40DE410F7 for ; Tue, 30 Nov 2021 17:37:52 +0100 (CET) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (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-1.canonical.com (Postfix) with ESMTPS id 978313F044 for ; Tue, 30 Nov 2021 16:37:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290272; bh=xJti6oSrMiPWPWfKLp9o4F5PWt2vtxaPQ/CyCbsOiHY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SEcIbpovC3uDG2OM4I3Kkv9LscKPKoxFEF8QSsyHTzzJ61BBVQ675iFKXWUJkLLKX DdkV/aKdzav5jfdQS0Fl1n2+rkdt9aVAHxaAiVg3VgQFVSGQl/Fb5RSB88f0zDqmVT 6y4DnRVqUzp8S/CILW030CCI2kOigOr08STIzOUDuWAVBDir1ig97Hee77aFStGNEj H78Hd4DpW1nS2PF8/5GSj8p4x+0fyobDIrIrEdDsD/7ShogGBkSUnrjoxF9bMBUtP+ XXmUQWkR88mZum59MGl/Mb0vMXYjFqR4+Yje/FDQQoccoNUpuRniXmPFCUCibuHMdz zxhP2S5geb2hw== Received: by mail-ed1-f72.google.com with SMTP id a3-20020a05640213c300b003e7d12bb925so17541259edx.9 for ; Tue, 30 Nov 2021 08:37:52 -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=xJti6oSrMiPWPWfKLp9o4F5PWt2vtxaPQ/CyCbsOiHY=; b=OnzW0BTqk6qLKzhZYfVQKqrJo9CkLslTEkrmvwoSCEq9T388vdnvFOs3eFlnBMBa8/ rZ4bTX8zzf1J65146ueJlyHD3//5/1TKXHDU1m/h1D75UX3Ky/aeXaqmgpTo8eG2ypJQ 9/sU4+qCE3xOQ/QZHfr6wtiEJ1Ni7l8bZszxJMML8z2nkhZm0dJcGQVVH7LoZizHXkae CQBsS9gb4xQOTfduSkaBkzS3bo0iNa2EAwoHmdBouqqeFgSMxoGCa+3ahsM+QIJNOILQ K3v9WzxqgcgOcMbdLheql86jmi31c13x8Su9ERMePawzP0PcGMW6dVO0SEu1s4Hwf79F 8Ibw== X-Gm-Message-State: AOAM532HjnuLs65b0kPfGn6vfwatG1pJQsALFvPGf3qydDRwQ4oxZ0VG rDXR9l/tRkfVKRIqTVhhzzbj+NtxRnH+x98qemELB4ZaDYCdTmMtPs6ZzmjCyfz3BtclAXd6FRW CNYOvMSipyAAuAEMce0zdVXVH X-Received: by 2002:a05:6402:516c:: with SMTP id d12mr84189438ede.391.1638290271993; Tue, 30 Nov 2021 08:37:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJxt19ZinDIB0PKsW5MfYKtmIkwX4d8SADqVaPXpQxii7UApsywALAi7mn7JL1+KxJrZh70k8Q== X-Received: by 2002:a05:6402:516c:: with SMTP id d12mr84189388ede.391.1638290271705; Tue, 30 Nov 2021 08:37:51 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id z1sm11621883edq.54.2021.11.30.08.37.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:37:51 -0800 (PST) From: christian.ehrhardt@canonical.com To: Qiming Chen Cc: Qi Zhang , dpdk stable Subject: patch 'net/i40e: fix device startup resource release' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:33:57 +0100 Message-Id: <20211130163605.2460997-33-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/1a6d098383c863a3ee306eb027c9c0c60b8e01a5 Thanks. Christian Ehrhardt --- >From 1a6d098383c863a3ee306eb027c9c0c60b8e01a5 Mon Sep 17 00:00:00 2001 From: Qiming Chen Date: Sat, 21 Aug 2021 17:44:35 +0800 Subject: [PATCH] net/i40e: fix device startup resource release [ upstream commit daf3332e11ed7ad6cc12e0aa69cbb8b602bc5685 ] In the eth_i40e_dev_init function, the tunnel and ethertype hash table resource release interface should be rte_hash_free instead of rte_free, and the previously registered interrupt handling function also needs to be removed from the interrupt list. The patch is amended to use the correct interface to release the hash table resource and release the interrupt handling function at the same time. Fixes: 425c3325f0b0 ("net/i40e: store tunnel filter") Fixes: 5c53c82c8174 ("net/i40e: store flow director filter") Signed-off-by: Qiming Chen Acked-by: Qi Zhang --- drivers/net/i40e/i40e_ethdev.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 0c896ea915..df9e8ca5c5 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -1721,12 +1721,14 @@ eth_i40e_dev_init(struct rte_eth_dev *dev, void *init_params __rte_unused) return 0; err_init_fdir_filter_list: - rte_free(pf->tunnel.hash_table); + rte_hash_free(pf->tunnel.hash_table); rte_free(pf->tunnel.hash_map); err_init_tunnel_filter_list: - rte_free(pf->ethertype.hash_table); + rte_hash_free(pf->ethertype.hash_table); rte_free(pf->ethertype.hash_map); err_init_ethtype_filter_list: + rte_intr_callback_unregister(intr_handle, + i40e_dev_interrupt_handler, dev); rte_free(dev->data->mac_addrs); dev->data->mac_addrs = NULL; err_mac_alloc: -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:07.983685462 +0100 +++ 0033-net-i40e-fix-device-startup-resource-release.patch 2021-11-30 16:50:05.638872414 +0100 @@ -1 +1 @@ -From daf3332e11ed7ad6cc12e0aa69cbb8b602bc5685 Mon Sep 17 00:00:00 2001 +From 1a6d098383c863a3ee306eb027c9c0c60b8e01a5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit daf3332e11ed7ad6cc12e0aa69cbb8b602bc5685 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 7b230e2ed1..7a2a8281d2 100644 +index 0c896ea915..df9e8ca5c5 100644 @@ -27 +28 @@ -@@ -1760,12 +1760,14 @@ eth_i40e_dev_init(struct rte_eth_dev *dev, void *init_params __rte_unused) +@@ -1721,12 +1721,14 @@ eth_i40e_dev_init(struct rte_eth_dev *dev, void *init_params __rte_unused)