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 75F7545BB6 for ; Wed, 23 Oct 2024 23:21:01 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 70EC24331E; Wed, 23 Oct 2024 23:21:01 +0200 (CEST) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mails.dpdk.org (Postfix) with ESMTP id 2B3DD40261 for ; Wed, 23 Oct 2024 23:21:00 +0200 (CEST) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-4315baa51d8so2192695e9.0 for ; Wed, 23 Oct 2024 14:21:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729718460; x=1730323260; 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=U66y7fRxKgi5TBn/WOCiS7rEppMhDZ5EGuaVLA5mwfI=; b=NZjowuJ2f4Bfddnx+XWYse0SrvyL+3hhgke6IBHi1CkFn6b9KykdiD18NdTgDgj4YP +LjW38LPyCTvfQx9s5EGDlgR4eol/Ri8Qna7848JQVwVAlbM+oR0t6TDsZyKU9uLZVwi 2L/W+IROJ4Dee6dTz6CS5qs2pWCE++7zU4qRAMP2NOT7qL9VYG5N7GVkgd0gO2/5uQnZ G8ZWvMjEePnz4AtnINl5Ffw7IU+alXr0MesOu97AbMlo5DFsBPFwGTdlo10Bj+0ZlBG6 oVo2cuRgGiqAh/KAwS03FoWdtN4phFx1CHAh1WE8mCZl0EwHaFYv8dLmknuSgUFLFEzv Jguw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729718460; x=1730323260; 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=U66y7fRxKgi5TBn/WOCiS7rEppMhDZ5EGuaVLA5mwfI=; b=XE+h6oI6kiMh+CkFho0rvs6qQt/YDnfZ5rLwzDZ3g1Nwy/VyBY2v1R3cYOxjQhYFMg BPrmHSq/3edxjww2lY3A2wiG+0X7B3uCCMIBdjn6AndFBxjXGcROguxeE8BTnEBzAIlx cm4nUlyZadx3RX8jifKuNJ5nNYlb0lFq3yJTm7LpS634NiD6RdYHu8Kk3HzEBecxCIz4 FVRCN4hYmU39c23Jh96jIg30mrtsdFbL+JpQ/HMk/34i9LIZMrrPFK+QbW2XsOXOXdlB 3fTMSz0Sx3D5IOV5H3sUM12PG3dxHvUMwJMJTyPrLflYRRVZxWJPQh7fKOW2hAIq0aaT UYlQ== X-Forwarded-Encrypted: i=1; AJvYcCUMOwx0fxqUeUfNh/XM/S6IUCSEletCd6De0vWfXuUJd5EuiNGpld7+xVcNL5/6lYpt9XFWntE=@dpdk.org X-Gm-Message-State: AOJu0YxVExSwPvx2KRykiT0CXHK3WBtajiI1lUMgieh1qky0T2BKBIti VdFsLoLXWH9daG6nZLOISSnC82L4/NgrysrBqQwmZxdbn0Ob58N/m4YkUNHV X-Google-Smtp-Source: AGHT+IFnCNTrHfmR6e04U+o2347L0RWOjyFJV357zHOQV9iMNdvfuMf8v/VuXIkrZutMhHYm5FMADg== X-Received: by 2002:a05:600c:1c11:b0:42c:a574:6360 with SMTP id 5b1f17b1804b1-431841aff4emr34411565e9.29.1729718459583; Wed, 23 Oct 2024 14:20:59 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:21cd:def0:a01d:d2aa]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37ee0a365e5sm9790082f8f.21.2024.10.23.14.20.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 14:20:59 -0700 (PDT) From: luca.boccassi@gmail.com To: Chengwen Feng Cc: Ferruh Yigit , dpdk stable Subject: patch 'ethdev: verify queue ID in Tx done cleanup' has been queued to stable release 22.11.7 Date: Wed, 23 Oct 2024 22:16:43 +0100 Message-ID: <20241023211704.1216956-63-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241023211704.1216956-1-luca.boccassi@gmail.com> References: <20241023211704.1216956-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 22.11.7 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/25/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/856f4dd1d2fd899a2c77de750d71ad8dd559bfa7 Thanks. Luca Boccassi --- >From 856f4dd1d2fd899a2c77de750d71ad8dd559bfa7 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 e85dc3d8b2..99b16e4dcc 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -2491,6 +2491,12 @@ rte_eth_tx_done_cleanup(uint16_t port_id, uint16_t queue_id, uint32_t free_cnt) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); 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 + if (*dev->dev_ops->tx_done_cleanup == NULL) return -ENOTSUP; -- 2.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-10-23 22:16:42.897969185 +0100 +++ 0063-ethdev-verify-queue-ID-in-Tx-done-cleanup.patch 2024-10-23 22:16:40.523943674 +0100 @@ -1 +1 @@ -From 707f50cef003a89f8fc5170c2ca5aea808cf4297 Mon Sep 17 00:00:00 2001 +From 856f4dd1d2fd899a2c77de750d71ad8dd559bfa7 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 e85dc3d8b2..99b16e4dcc 100644 @@ -21 +22 @@ -@@ -2910,6 +2910,12 @@ rte_eth_tx_done_cleanup(uint16_t port_id, uint16_t queue_id, uint32_t free_cnt) +@@ -2491,6 +2491,12 @@ rte_eth_tx_done_cleanup(uint16_t port_id, uint16_t queue_id, uint32_t free_cnt)