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 1197446211 for ; Thu, 13 Feb 2025 11:02:00 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 00A1942EE7; Thu, 13 Feb 2025 11:02:00 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 3244740287 for ; Thu, 13 Feb 2025 11:01:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739440917; 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=wqbTkBKm4BxyQo0Z5pi0nzj1IWyFQrPegT68cMv5TVc=; b=TOavCbeXVpms5QneqMcHzvqeROnvqG8JzlqHcciLTU+BVwIfD8hmmGt4h5A+mN1CrDM6WU RBuqXFOJq6jmv5MiN2JTB9SvuBeaFWqF9MTds3AwSmk16YmNSgXWlRThGjFJ75Gi2gLeCI m7hjFgc2UAZPlCB5FCuxu+QwCBjfCkE= Received: from mx-prod-mc-03.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-457-wuuyJO_GNF6SLFVBEt85tw-1; Thu, 13 Feb 2025 05:01:54 -0500 X-MC-Unique: wuuyJO_GNF6SLFVBEt85tw-1 X-Mimecast-MFC-AGG-ID: wuuyJO_GNF6SLFVBEt85tw Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4E24419560BC; Thu, 13 Feb 2025 10:01:53 +0000 (UTC) Received: from rh.Home (unknown [10.45.224.21]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 871851800365; Thu, 13 Feb 2025 10:01:51 +0000 (UTC) From: Kevin Traynor To: Huisong Li Cc: Thomas Monjalon , dpdk stable Subject: patch 'ethdev: fix functions available in new device event' has been queued to stable release 24.11.2 Date: Thu, 13 Feb 2025 09:58:24 +0000 Message-ID: <20250213095933.362078-57-ktraynor@redhat.com> In-Reply-To: <20250213095933.362078-1-ktraynor@redhat.com> References: <20250213095933.362078-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: CylHsBfhxekwY3O-PQUVIBpNLmw7HTtIsVsuALFkvqY_1739440913 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 24.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/17/25. 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/69fe60c6d76f3125ab1f477341260a2b59f20649 Thanks. Kevin --- >From 69fe60c6d76f3125ab1f477341260a2b59f20649 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Fri, 17 Jan 2025 17:12:10 +0800 Subject: [PATCH] ethdev: fix functions available in new device event [ upstream commit 0b8f35358ceb0178878f72b66a36dc0ab7924377 ] During probing, before the port becomes generally available, the rte_eth_dev_socket_id() and rte_eth_dev_owner_*() are available to the application. Fixes: 7dcd73e37965 ("drivers/bus: set device NUMA node to unknown by default") Fixes: 53ef1b34776b ("ethdev: add sanity checks in control APIs") Signed-off-by: Huisong Li Acked-by: Thomas Monjalon --- lib/ethdev/rte_ethdev.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index 6413c54e3b..9cfb397cee 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -601,7 +601,8 @@ rte_eth_dev_owner_get(const uint16_t port_id, struct rte_eth_dev_owner *owner) int ret; - RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); - ethdev = &rte_eth_devices[port_id]; + if (port_id >= RTE_MAX_ETHPORTS) + return -ENODEV; + ethdev = &rte_eth_devices[port_id]; if (!eth_dev_is_allocated(ethdev)) { RTE_ETHDEV_LOG_LINE(ERR, "Port ID %"PRIu16" is not allocated", @@ -636,6 +637,13 @@ rte_eth_dev_socket_id(uint16_t port_id) { int socket_id = SOCKET_ID_ANY; + struct rte_eth_dev *ethdev; - if (!rte_eth_dev_is_valid_port(port_id)) { + if (port_id >= RTE_MAX_ETHPORTS) { + rte_errno = EINVAL; + return socket_id; + } + + ethdev = &rte_eth_devices[port_id]; + if (!eth_dev_is_allocated(ethdev)) { rte_errno = EINVAL; } else { -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:40.588338914 +0000 +++ 0057-ethdev-fix-functions-available-in-new-device-event.patch 2025-02-12 17:29:34.372946061 +0000 @@ -1 +1 @@ -From 0b8f35358ceb0178878f72b66a36dc0ab7924377 Mon Sep 17 00:00:00 2001 +From 69fe60c6d76f3125ab1f477341260a2b59f20649 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0b8f35358ceb0178878f72b66a36dc0ab7924377 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -18,2 +19 @@ - lib/ethdev/rte_ethdev.h | 3 ++- - 2 files changed, 13 insertions(+), 4 deletions(-) + 1 file changed, 11 insertions(+), 3 deletions(-) @@ -22 +22 @@ -index b7cb26f0d3..c4079bb924 100644 +index 6413c54e3b..9cfb397cee 100644 @@ -25 +25 @@ -@@ -603,7 +603,8 @@ rte_eth_dev_owner_get(const uint16_t port_id, struct rte_eth_dev_owner *owner) +@@ -601,7 +601,8 @@ rte_eth_dev_owner_get(const uint16_t port_id, struct rte_eth_dev_owner *owner) @@ -36 +36 @@ -@@ -638,6 +639,13 @@ rte_eth_dev_socket_id(uint16_t port_id) +@@ -636,6 +637,13 @@ rte_eth_dev_socket_id(uint16_t port_id) @@ -51,12 +50,0 @@ -diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h -index 978104d232..40d97b17d4 100644 ---- a/lib/ethdev/rte_ethdev.h -+++ b/lib/ethdev/rte_ethdev.h -@@ -4163,5 +4163,6 @@ enum rte_eth_event_type { - * The port is being probed, i.e. allocated and not yet available. - * It is too early to check validity, query infos, and configure -- * the port. -+ * the port. But some functions, like rte_eth_dev_socket_id() and -+ * rte_eth_dev_owner_*() are available to the application. - */ - RTE_ETH_EVENT_NEW,