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 768A845DB9 for ; Wed, 27 Nov 2024 18:21:37 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5A8EA4069F; Wed, 27 Nov 2024 18:21:37 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id E95554069F for ; Wed, 27 Nov 2024 18:21:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732728095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bl+5kT7Waw63YM7CPVN2//e53nVH/99Oh9bajziJVqA=; b=FUgbNYVNhXpj6Xh4drN9E6hXtcmYdKS48DHrL6oOnkp44httBE+rNddP7gR8EzZHKthe3r IkZjf7Z1W2qo6I5SAQQnSHAGmqRUeHlaWgUqupqM20W20grk3e1QFzRYnzNAoCHqjVf9nq UXxY98VRThK8Y+uoX06MvTebNNLcT98= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-582-hEkEjHhtMhiHmcmOH7AbcA-1; Wed, 27 Nov 2024 12:21:31 -0500 X-MC-Unique: hEkEjHhtMhiHmcmOH7AbcA-1 X-Mimecast-MFC-AGG-ID: hEkEjHhtMhiHmcmOH7AbcA Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AA25A1956083; Wed, 27 Nov 2024 17:21:30 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.52]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2773030001A2; Wed, 27 Nov 2024 17:21:28 +0000 (UTC) From: Kevin Traynor To: Chengwen Feng Cc: Ferruh Yigit , dpdk stable Subject: patch 'ethdev: verify queue ID in Tx done cleanup' has been queued to stable release 21.11.9 Date: Wed, 27 Nov 2024 17:18:03 +0000 Message-ID: <20241127171916.690404-56-ktraynor@redhat.com> In-Reply-To: <20241127171916.690404-1-ktraynor@redhat.com> References: <20241127171916.690404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: sapaBMivaxeZZO378pYrs-bZchzKGLwJSD9t5e35GfQ_1732728090 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/02/24. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/b0983ba4bb70241ca127bc482a961bbee3905c4a Thanks. Kevin --- >From b0983ba4bb70241ca127bc482a961bbee3905c4a Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Sat, 12 Oct 2024 17:14:37 +0800 Subject: [PATCH] ethdev: verify queue ID in Tx done cleanup [ upstream commit 707f50cef003a89f8fc5170c2ca5aea808cf4297 ] Verify queue_id for rte_eth_tx_done_cleanup API. Fixes: 44a718c457b5 ("ethdev: add API to free consumed buffers in Tx ring") Signed-off-by: Chengwen Feng Reviewed-by: Ferruh Yigit --- lib/ethdev/rte_ethdev.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index 1b2e1750c9..a2b2792a6a 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -2650,4 +2650,10 @@ rte_eth_tx_done_cleanup(uint16_t port_id, uint16_t queue_id, uint32_t free_cnt) dev = &rte_eth_devices[port_id]; +#ifdef RTE_ETHDEV_DEBUG_TX + ret = eth_dev_validate_tx_queue(dev, queue_id); + if (ret != 0) + return ret; +#endif + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_done_cleanup, -ENOTSUP); -- 2.47.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-27 17:17:40.025271740 +0000 +++ 0056-ethdev-verify-queue-ID-in-Tx-done-cleanup.patch 2024-11-27 17:17:38.231269404 +0000 @@ -1 +1 @@ -From 707f50cef003a89f8fc5170c2ca5aea808cf4297 Mon Sep 17 00:00:00 2001 +From b0983ba4bb70241ca127bc482a961bbee3905c4a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 707f50cef003a89f8fc5170c2ca5aea808cf4297 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 12f42f1d68..6413c54e3b 100644 +index 1b2e1750c9..a2b2792a6a 100644 @@ -21 +22 @@ -@@ -2911,4 +2911,10 @@ rte_eth_tx_done_cleanup(uint16_t port_id, uint16_t queue_id, uint32_t free_cnt) +@@ -2650,4 +2650,10 @@ rte_eth_tx_done_cleanup(uint16_t port_id, uint16_t queue_id, uint32_t free_cnt) @@ -30,2 +31,2 @@ - if (*dev->dev_ops->tx_done_cleanup == NULL) - return -ENOTSUP; + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_done_cleanup, -ENOTSUP); +