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 DFEFA431A0 for ; Thu, 19 Oct 2023 02:01:02 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D9317410E3; Thu, 19 Oct 2023 02:01:02 +0200 (CEST) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mails.dpdk.org (Postfix) with ESMTP id CCE52410F2 for ; Thu, 19 Oct 2023 02:01:01 +0200 (CEST) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-4083f61322fso8502415e9.1 for ; Wed, 18 Oct 2023 17:01:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697673661; x=1698278461; darn=dpdk.org; 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=MX1tYtjj7M2+akHMh04oh1M80mGiOJ0phy6Az7j9QRI=; b=emH07LUYhvfGIGVZEBPmVeFYe29SDfw6Fu6sLzlhByRhoeHXAQsW2Lzgx6KwTl0s5w uHX424r2Z5eoKAIkBtMNIp9l4aK9sPRwHTe+/z1UcxdAtoI4TZhYcnRrtlDdH8kYRsIn pIsqXzrV7fzyxmk+7WuOQQvpV91RalEpxndZ4qnzuKDGzcqkELH4KV0AWZxHlpCP4DDx zfZ894BkG1YKW39U7VvRp5/jkU2Z53Zs7571wMR0PESjyVfRMkM9aIsoodjYro7alkLR hJq48Nycu2KNKXV1Z+xBKmvXAJd+gq1z59/4pqhYvRw9PFme6pTlsrmHUW53IN+g63Lj p3Eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697673661; x=1698278461; 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=MX1tYtjj7M2+akHMh04oh1M80mGiOJ0phy6Az7j9QRI=; b=sYFRVgfU19ctHX6SLQbxoCjhJxsJMkfXhLpi2fSMRz8xVZbSRczAYoVDTND35ELCyv 1OwabzLdmk8bTU2Kyz28d/c7q/24SbJEl39nzX0D3vubKvCNk0v0GvV/swumiUwedLBO Rq3YEY9mz8qDj/XJE49BeQTveSD1TdoKLTBs0HDuVvJQuPLvt6MQsRqn8hMWCDE2GIQ4 fwh+34+tPuwSqt908vW7mqwSmAoxkq47f8X/e1dWAjg8GSqmv9+qzOYAFln6Gd99ux/8 M0RRAQJrcNljwPe2J7yQvB22v/fLZf6ZPtQVzrdGSeiX/+ElgbK8/wUA13hQdJpNXaNc V0Tg== X-Gm-Message-State: AOJu0Yy6xg7Ujy5aThqLmRuYivomQWg90ET+qmPJ2CMzR4ej3uQTOWbF FJEC+EHTyG2ROQISrjm0JdoZk9ouSOlJuA== X-Google-Smtp-Source: AGHT+IFjdHWFgHaaN/rV4FQRUw1S+JjQYqZn71kQUq+B7D8HFUS4I2u8V40CCRo+i2SBShr0i1fTMA== X-Received: by 2002:a05:600c:3508:b0:406:8494:f684 with SMTP id h8-20020a05600c350800b004068494f684mr543531wmq.23.1697673661441; Wed, 18 Oct 2023 17:01:01 -0700 (PDT) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id x8-20020adfec08000000b00326f0ca3566sm3146539wrn.50.2023.10.18.17.01.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 17:01:01 -0700 (PDT) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: Qi Zhang , dpdk stable Subject: patch 'net/i40e: fix buffer leak on Rx reconfiguration' has been queued to stable release 20.11.10 Date: Thu, 19 Oct 2023 00:59:19 +0100 Message-Id: <20231018235930.3144-30-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231018235930.3144-1-luca.boccassi@gmail.com> References: <20231018235930.3144-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.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/21/23. 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/56d20825a02387f910c87ef9eb986f357d44b46f Thanks. Luca Boccassi --- >From 56d20825a02387f910c87ef9eb986f357d44b46f Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Thu, 31 Aug 2023 13:33:34 +0100 Subject: [PATCH] net/i40e: fix buffer leak on Rx reconfiguration [ upstream commit 56dcaa41325a8a347ba52e5d89dce5e8dafa7f8c ] When reconfiguring a single queue on a device, the mbuf initializer value was not getting set, and remained at zero. This lead to mbuf leaks as the refcount was incorrect (0), so on free it wrapped around to UINT16_MAX. When setting up the mbuf initializer, also ensure that the queue is explicitly marked as using a vector function by setting the "rx_using_sse" flag. Fixes: a3c83a2527e1 ("net/i40e: enable runtime queue setup") Signed-off-by: Bruce Richardson Acked-by: Qi Zhang --- drivers/net/i40e/i40e_rxtx.c | 6 ++++++ drivers/net/i40e/i40e_rxtx_vec_common.h | 1 + 2 files changed, 7 insertions(+) diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index 3b6c41c271..6f5ea8c55a 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -1818,6 +1818,12 @@ i40e_dev_rx_queue_setup_runtime(struct rte_eth_dev *dev, if (use_def_burst_func) ad->rx_bulk_alloc_allowed = false; i40e_set_rx_function(dev); + + if (ad->rx_vec_allowed && i40e_rxq_vec_setup(rxq)) { + PMD_DRV_LOG(ERR, "Failed vector rx setup."); + return -EINVAL; + } + return 0; } else if (ad->rx_vec_allowed && !rte_is_power_of_2(rxq->nb_rx_desc)) { PMD_DRV_LOG(ERR, "Vector mode is allowed, but descriptor" diff --git a/drivers/net/i40e/i40e_rxtx_vec_common.h b/drivers/net/i40e/i40e_rxtx_vec_common.h index 31f73f6054..aa6e6ed80c 100644 --- a/drivers/net/i40e/i40e_rxtx_vec_common.h +++ b/drivers/net/i40e/i40e_rxtx_vec_common.h @@ -186,6 +186,7 @@ i40e_rxq_vec_setup_default(struct i40e_rx_queue *rxq) rte_compiler_barrier(); p = (uintptr_t)&mb_def.rearm_data; rxq->mbuf_initializer = *(uint64_t *)p; + rxq->rx_using_sse = 1; return 0; } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-19 00:28:57.753918833 +0100 +++ 0030-net-i40e-fix-buffer-leak-on-Rx-reconfiguration.patch 2023-10-19 00:28:56.285806319 +0100 @@ -1 +1 @@ -From 56dcaa41325a8a347ba52e5d89dce5e8dafa7f8c Mon Sep 17 00:00:00 2001 +From 56d20825a02387f910c87ef9eb986f357d44b46f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 56dcaa41325a8a347ba52e5d89dce5e8dafa7f8c ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index f37bf30d56..9aa5facb53 100644 +index 3b6c41c271..6f5ea8c55a 100644 @@ -27 +28 @@ -@@ -1918,6 +1918,12 @@ i40e_dev_rx_queue_setup_runtime(struct rte_eth_dev *dev, +@@ -1818,6 +1818,12 @@ i40e_dev_rx_queue_setup_runtime(struct rte_eth_dev *dev, @@ -41 +42 @@ -index fe1a6ec75e..8b745630e4 100644 +index 31f73f6054..aa6e6ed80c 100644 @@ -44 +45 @@ -@@ -201,6 +201,7 @@ i40e_rxq_vec_setup_default(struct i40e_rx_queue *rxq) +@@ -186,6 +186,7 @@ i40e_rxq_vec_setup_default(struct i40e_rx_queue *rxq)