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 9AA7EA0C41 for ; Tue, 30 Nov 2021 17:37:22 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 91575410F7; Tue, 30 Nov 2021 17:37:22 +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 749D6410F7 for ; Tue, 30 Nov 2021 17:37:21 +0100 (CET) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (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 456F93F1E5 for ; Tue, 30 Nov 2021 16:37:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290241; bh=lZySasSO0jQS0xy3KuF7swq9Beyg4aB6WIYYul1oOy0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=se7MATVRiu0/PBUF6bgZOYhHhOcU6Ky7PhIZlfHphfPyd5hmoSRJxtPobIGgznqKx pwuku6ZKyh18mqK2wNhSmM0/BJaRYUVlOVfT6zOHR7h34IB27I9z0VM3LEo2629N47 +AUKCjFf+QxsDQTIMopm6RIKdcREBiqsoNWyxjTc5yF3/S4KOMFHmQpgxdg4u1WftL prGGKFdPJyubOouU2QHI5yY8jegAayLZ6yazxH7EJu582Z+UQNy1MAyZfEM0gItxDm vcLxsIZRFhOg0z9eWvDraiuJDgW6NjLy6b3pSpVlXa26L0gvQr+rTfg5iZTgmwMoNI xjfJqVy+rIpFw== Received: by mail-ed1-f70.google.com with SMTP id m12-20020a056402430c00b003e9f10bbb7dso17432081edc.18 for ; Tue, 30 Nov 2021 08:37:21 -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=lZySasSO0jQS0xy3KuF7swq9Beyg4aB6WIYYul1oOy0=; b=eJtcXEpWlo4MSeByGDsAttdrK5ssoW1LqUYP7rWmIFaNRRwBX9L1tdPWYF+qo7chS6 x8zIOWUUoAv5PFybFsK9Duq7oPuHMNUKpt2hffasfTskmo4z/0EzmIMx3aQXHT/+jcS6 PbWnJSNOlPETuuReEc8Z9YVwCkj0g/tNUhuiVXNnN5VpVb3edzI7m4SOZowjYxbOUgRQ j2EVNxC+DOzCZ5E2pG6XO7utVK+OSbB4lP0yystEZMhRgT7OepcSi6B6/J5oBon1subx 6oiPdIEmRGwm2Krzumx7TrXB0WtdKApQg0GiXh5K7aAuhTmssnqK40OdW+wcmYak0YB2 z53w== X-Gm-Message-State: AOAM533aYiL8iUacODS0kYMDzE+LO1OCF1AEX3c4SEstpiP/TC2iKFnR fhMSR6ehVmdw6oE7MRJLubx66xvfXJDu/8SKEagQwHRPYRx+ccDJbEt7hZ2oBaxezeHrc00xuca J9GTAXtXU1p/CPybn7YT23a2B X-Received: by 2002:a17:906:dc90:: with SMTP id cs16mr208018ejc.432.1638290240550; Tue, 30 Nov 2021 08:37:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJxzWOiMHdwPz1iJxCUu6LflqypbV+eYaaA9KfF+x4x+cOK80R0Ya8ZYFIORUewef48BcfMOOg== X-Received: by 2002:a17:906:dc90:: with SMTP id cs16mr207982ejc.432.1638290240246; Tue, 30 Nov 2021 08:37:20 -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.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:37:19 -0800 (PST) From: christian.ehrhardt@canonical.com To: Qiming Chen Cc: Haiyue Wang , dpdk stable Subject: patch 'net/ixgbe: fix queue resource leak' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:33:46 +0100 Message-Id: <20211130163605.2460997-22-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/17aff3d97569802cccc60d973c543e9290e4819f Thanks. Christian Ehrhardt --- >From 17aff3d97569802cccc60d973c543e9290e4819f Mon Sep 17 00:00:00 2001 From: Qiming Chen Date: Tue, 31 Aug 2021 21:40:17 +0800 Subject: [PATCH] net/ixgbe: fix queue resource leak [ upstream commit 3a732dce93af3355854dbd0fbfbe26d8c8ec8982 ] In the ixgbevf_dev_start function, after initializing the rxtx queue, if an exception occurs in the subsequent function, the rxtx queue needs to be released. The patch solves the problem of queue resource leakage. Fixes: 0eb609239efd ("ixgbe: enable Rx queue interrupts for PF and VF") Signed-off-by: Qiming Chen Acked-by: Haiyue Wang --- drivers/net/ixgbe/ixgbe_ethdev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 0b6a6845a4..a938729da7 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -5409,8 +5409,10 @@ ixgbevf_dev_start(struct rte_eth_dev *dev) * now only one vector is used for Rx queue */ intr_vector = 1; - if (rte_intr_efd_enable(intr_handle, intr_vector)) + if (rte_intr_efd_enable(intr_handle, intr_vector)) { + ixgbe_dev_clear_queues(dev); return -1; + } } if (rte_intr_dp_is_en(intr_handle) && !intr_handle->intr_vec) { @@ -5420,6 +5422,7 @@ ixgbevf_dev_start(struct rte_eth_dev *dev) if (intr_handle->intr_vec == NULL) { PMD_INIT_LOG(ERR, "Failed to allocate %d rx_queues" " intr_vec", dev->data->nb_rx_queues); + ixgbe_dev_clear_queues(dev); return -ENOMEM; } } -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:07.401756815 +0100 +++ 0022-net-ixgbe-fix-queue-resource-leak.patch 2021-11-30 16:50:05.582872003 +0100 @@ -1 +1 @@ -From 3a732dce93af3355854dbd0fbfbe26d8c8ec8982 Mon Sep 17 00:00:00 2001 +From 17aff3d97569802cccc60d973c543e9290e4819f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3a732dce93af3355854dbd0fbfbe26d8c8ec8982 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 7b198d95c2..3371a7df78 100644 +index 0b6a6845a4..a938729da7 100644 @@ -23 +24 @@ -@@ -5362,8 +5362,10 @@ ixgbevf_dev_start(struct rte_eth_dev *dev) +@@ -5409,8 +5409,10 @@ ixgbevf_dev_start(struct rte_eth_dev *dev) @@ -35 +36 @@ -@@ -5373,6 +5375,7 @@ ixgbevf_dev_start(struct rte_eth_dev *dev) +@@ -5420,6 +5422,7 @@ ixgbevf_dev_start(struct rte_eth_dev *dev)