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 8F37848A44 for ; Fri, 31 Oct 2025 15:37:06 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 87F9C40150; Fri, 31 Oct 2025 15:37:06 +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 657E34065D for ; Fri, 31 Oct 2025 15:37:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761921424; 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=Z/7/KX8FjW/SyHk4RQ7TMM4OQU6ju85B2po6eX+czmc=; b=LLaPFpEZuVWCX/3KkG3WiUxN4y4brX0yO9o/nDFmVu3eYrzozTLTouRFtVJagcdgsLmhXH lEwJ3O6uFzPDBjVT5ryEy4kvWQN7zk3YgMH2qAil/JBK+peZlftqKoF6mp5nG2L96ihYco pCxq+lHZdio7HKTrQxo7CrRtfQQgGNw= 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-623-GOp3RJfLN8C75aro-vGrKQ-1; Fri, 31 Oct 2025 10:37:00 -0400 X-MC-Unique: GOp3RJfLN8C75aro-vGrKQ-1 X-Mimecast-MFC-AGG-ID: GOp3RJfLN8C75aro-vGrKQ_1761921419 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 9192C1956080; Fri, 31 Oct 2025 14:36:59 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.50]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0954D180044F; Fri, 31 Oct 2025 14:36:57 +0000 (UTC) From: Kevin Traynor To: Gregory Etelson Cc: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix interface name parameter definition' has been queued to stable release 24.11.4 Date: Fri, 31 Oct 2025 14:32:45 +0000 Message-ID: <20251031143421.324432-43-ktraynor@redhat.com> In-Reply-To: <20251031143421.324432-1-ktraynor@redhat.com> References: <20251031143421.324432-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: _qFi05hsy3quuNhGhjh9g4BfBHIE5kZYc8v0DVsVsik_1761921419 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/05/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/d18c004a899b338dab7e31723d91b52b47a0444a Thanks. Kevin --- >From d18c004a899b338dab7e31723d91b52b47a0444a Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Sun, 10 Aug 2025 16:22:59 +0300 Subject: [PATCH] net/mlx5: fix interface name parameter definition [ upstream commit 9e58a50c059f3760c51ddee16073496c6e1d510a ] The patch fixes `ifname` parameter as a character buffer. Fixes: 1256805dd54d ("net/mlx5: move Linux-specific functions") Signed-off-by: Gregory Etelson Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/linux/mlx5_ethdev_os.c | 11 +++++------ drivers/net/mlx5/linux/mlx5_os.c | 2 +- drivers/net/mlx5/mlx5.h | 3 +-- drivers/net/mlx5/windows/mlx5_ethdev_os.c | 4 ++-- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/drivers/net/mlx5/linux/mlx5_ethdev_os.c b/drivers/net/mlx5/linux/mlx5_ethdev_os.c index 5d64984022..f78d602098 100644 --- a/drivers/net/mlx5/linux/mlx5_ethdev_os.c +++ b/drivers/net/mlx5/linux/mlx5_ethdev_os.c @@ -73,5 +73,5 @@ mlx5_auxiliary_get_ifindex(const char *sf_name) */ int -mlx5_get_ifname(const struct rte_eth_dev *dev, char (*ifname)[MLX5_NAMESIZE]) +mlx5_get_ifname(const struct rte_eth_dev *dev, char ifname[MLX5_NAMESIZE]) { struct mlx5_priv *priv = dev->data->dev_private; @@ -87,10 +87,9 @@ mlx5_get_ifname(const struct rte_eth_dev *dev, char (*ifname)[MLX5_NAMESIZE]) if (!ifindex) { if (!priv->representor) - return mlx5_get_ifname_sysfs(priv->sh->ibdev_path, - *ifname); + return mlx5_get_ifname_sysfs(priv->sh->ibdev_path, ifname); rte_errno = ENXIO; return -rte_errno; } - if (if_indextoname(ifindex, &(*ifname)[0])) + if (if_indextoname(ifindex, ifname)) return 0; rte_errno = errno; @@ -150,8 +149,8 @@ static int mlx5_ifreq(const struct rte_eth_dev *dev, int req, struct ifreq *ifr) { - char ifname[sizeof(ifr->ifr_name)]; + char ifname[MLX5_NAMESIZE]; int ret; - ret = mlx5_get_ifname(dev, &ifname); + ret = mlx5_get_ifname(dev, ifname); if (ret) return -rte_errno; diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index 695911008d..5ae226cb08 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -1587,5 +1587,5 @@ err_secondary: char ifname[MLX5_NAMESIZE]; - if (mlx5_get_ifname(eth_dev, &ifname) == 0) + if (mlx5_get_ifname(eth_dev, ifname) == 0) DRV_LOG(DEBUG, "port %u ifname is \"%s\"", eth_dev->data->port_id, ifname); diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 8849334755..296276c7ca 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -2290,6 +2290,5 @@ uint64_t mlx5_get_restore_flags(struct rte_eth_dev *dev, /* mlx5_ethdev_os.c */ -int mlx5_get_ifname(const struct rte_eth_dev *dev, - char (*ifname)[MLX5_NAMESIZE]); +int mlx5_get_ifname(const struct rte_eth_dev *dev, char ifname[MLX5_NAMESIZE]); unsigned int mlx5_ifindex(const struct rte_eth_dev *dev); int mlx5_get_mac(struct rte_eth_dev *dev, uint8_t (*mac)[RTE_ETHER_ADDR_LEN]); diff --git a/drivers/net/mlx5/windows/mlx5_ethdev_os.c b/drivers/net/mlx5/windows/mlx5_ethdev_os.c index 49f750be68..2e9c9d5b3f 100644 --- a/drivers/net/mlx5/windows/mlx5_ethdev_os.c +++ b/drivers/net/mlx5/windows/mlx5_ethdev_os.c @@ -57,5 +57,5 @@ mlx5_get_mac(struct rte_eth_dev *dev, uint8_t (*mac)[RTE_ETHER_ADDR_LEN]) */ int -mlx5_get_ifname(const struct rte_eth_dev *dev, char (*ifname)[MLX5_NAMESIZE]) +mlx5_get_ifname(const struct rte_eth_dev *dev, char ifname[MLX5_NAMESIZE]) { struct mlx5_priv *priv; @@ -68,5 +68,5 @@ mlx5_get_ifname(const struct rte_eth_dev *dev, char (*ifname)[MLX5_NAMESIZE]) priv = dev->data->dev_private; context_obj = (mlx5_context_st *)priv->sh->cdev->ctx; - strncpy(*ifname, context_obj->mlx5_dev.name, MLX5_NAMESIZE); + strncpy(ifname, context_obj->mlx5_dev.name, MLX5_NAMESIZE); return 0; } -- 2.51.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-10-31 13:53:53.621853539 +0000 +++ 0043-net-mlx5-fix-interface-name-parameter-definition.patch 2025-10-31 13:53:52.140523693 +0000 @@ -1 +1 @@ -From 9e58a50c059f3760c51ddee16073496c6e1d510a Mon Sep 17 00:00:00 2001 +From d18c004a899b338dab7e31723d91b52b47a0444a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9e58a50c059f3760c51ddee16073496c6e1d510a ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index a371c2c747..4acaaca9ca 100644 +index 5d64984022..f78d602098 100644 @@ -24 +25 @@ -@@ -74,5 +74,5 @@ mlx5_auxiliary_get_ifindex(const char *sf_name) +@@ -73,5 +73,5 @@ mlx5_auxiliary_get_ifindex(const char *sf_name) @@ -31 +32 @@ -@@ -88,10 +88,9 @@ mlx5_get_ifname(const struct rte_eth_dev *dev, char (*ifname)[MLX5_NAMESIZE]) +@@ -87,10 +87,9 @@ mlx5_get_ifname(const struct rte_eth_dev *dev, char (*ifname)[MLX5_NAMESIZE]) @@ -44 +45 @@ -@@ -151,8 +150,8 @@ static int +@@ -150,8 +149,8 @@ static int @@ -56 +57 @@ -index 85b3fabaf5..3d87aec5bc 100644 +index 695911008d..5ae226cb08 100644 @@ -59 +60 @@ -@@ -1588,5 +1588,5 @@ err_secondary: +@@ -1587,5 +1587,5 @@ err_secondary: @@ -67 +68 @@ -index 53f0a27445..93e298d648 100644 +index 8849334755..296276c7ca 100644 @@ -70 +71 @@ -@@ -2349,6 +2349,5 @@ void mlx5_get_mtu_bounds(struct rte_eth_dev *dev, uint16_t *min_mtu, uint16_t *m +@@ -2290,6 +2290,5 @@ uint64_t mlx5_get_restore_flags(struct rte_eth_dev *dev, @@ -79 +80 @@ -index 4f43b95a09..32a9f599b2 100644 +index 49f750be68..2e9c9d5b3f 100644