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 C6CF748AEF for ; Wed, 12 Nov 2025 17:55:10 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C22AC40DCB; Wed, 12 Nov 2025 17:55:10 +0100 (CET) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mails.dpdk.org (Postfix) with ESMTP id 4BCFE40DCB for ; Wed, 12 Nov 2025 17:55:10 +0100 (CET) Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-47118259fd8so8151905e9.3 for ; Wed, 12 Nov 2025 08:55:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762966510; x=1763571310; 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=TlAJdJQv+mbiDPcH2dqFNG0NXsBANcewf4OQxkGkH7g=; b=Eb7OiUx1UaBnMeNe2GwRvRAI6cnwNIbwo2JG89km6O0xgr6iHreoXiSX7bi9J2h2i4 ROXcEdNAPCVuBjeKqL7B+7Tfin8+jHARiEUZ+P7yzMjBs0hiwnJVui+NVCidJvz0c0L4 blByT+yrWBJINCefrChfIlGPzjwQ6kZ0+KEqycaLeeCXzvCGgbs82aQeF1VUDvHzJymJ RqkzMJ+w51PkjD/A2MWDxBFb/AWP+mMZQGbTMc1stgwfP7pKFmuSKVu4ipcQyT/IqaQP aerS5Z3J7FVGQgAk7h6smUhaDoUyP/uk8ZoFt5/4GmlrWIVSXlXMF7BhRrvWmDnWnMwY dWIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762966510; x=1763571310; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=TlAJdJQv+mbiDPcH2dqFNG0NXsBANcewf4OQxkGkH7g=; b=PPA4f+Lk4N/16UD49t/ZLBzSYX0M41AUg0c4AAEFPyQoWdx+w7hXE27QgR4XsBCiT2 NIShmCOTVwQvLEE8lCLCEn/qd/O3ze61aObacnuJVtZSJMAvyaruwO3t+VRu5SQPWWeN c9dOA+lmhF7DZckDJNJB5Jo6eCdwwItVNQ4+w5TBhn186gK1TQXRYHUo/lR8HqtIf1fO hMZdqtciyb/UWn8y9TwwtA9DDpbnLo2nUvDk/H0JeUwlfV9D0B885NkudaXEoiPhCfty WAJxWZv0RzKWjW8ArjFgl5BSzvtV7zgnzWrMYS0HkRdGdssx7mxBULbxeP0t3ZiSQv80 b/ig== X-Forwarded-Encrypted: i=1; AJvYcCXGUhhSQa6Z+NaY/sX3oJKJWh8F4bVjA8Qvy+4yiMYzVxs7EZYzIK3vCGJhMv8Eh7cIg6QiSGA=@dpdk.org X-Gm-Message-State: AOJu0YyTkicV03v6ShX1ydyA3WGp/iyEz3l4s2jgdNYE26rxEDOEAcEO iGEGN3w2sy/PkZlA/e1y3NjP4auDkY4T9G65zZjugSXF0FgnFVJix/lQ8kGXJA== X-Gm-Gg: ASbGncvAd0qvsBCU4OZf2FUHgmMqOmNWb7J3MH6tMSne4JyLAabsf3k1ts1k/ZnbMyv ShfWzBXtB/nuY1pmfsYu994fSN9q7LKozzrTyf2WgWtUXgOzCpAlP+peP9DdYXigBjDdwUbelO3 WX0c6r7xNLGOvpk2FmG2xAVO+28aIWtGR00Ji/AykA31DEgXRLyLpBi7tEYcQyj3gqNXq4Z9Kw9 iD1J7dDRrUrKiwLG/UjgiR2mOl9oLqpssqOUeRfzfkftvnWmnBKAg2V1qvXS19dsc8yja2vUhnl VJ/Nq5ISCJs2ck3hLYHhQ9FXG3GRFZMAYxMyOW79QuSF9q5XksJ2WBjYihVFl4Ctd6/OL7wc8yu NE+mmTcp5t7LUF0gjxnGCqE5+odWOHKQ0LlnLwGXXnhWGEwsf8RqRELg/hYE/JvZiU/ANvW5jnt iQYDx5Ug== X-Google-Smtp-Source: AGHT+IHIFi9QnaFZjm0oj8RMO8ExWZ0N3ydiz13PRxbGiO/8cokppSYc5p5yrnGGPgOYgj6tfgSmEg== X-Received: by 2002:a05:600c:3144:b0:477:79f8:da9d with SMTP id 5b1f17b1804b1-477870c5eb4mr28341785e9.24.1762966509793; Wed, 12 Nov 2025 08:55:09 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:a397:14bc:5982:5745]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4778bcf051dsm366385e9.3.2025.11.12.08.55.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Nov 2025 08:55:09 -0800 (PST) From: luca.boccassi@gmail.com To: Adrian Schollmeyer Cc: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: store MTU at Rx queue allocation time' has been queued to stable release 22.11.11 Date: Wed, 12 Nov 2025 16:52:52 +0000 Message-ID: <20251112165308.1618107-38-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251112165308.1618107-1-luca.boccassi@gmail.com> References: <20251027162001.3710450-79-luca.boccassi@gmail.com> <20251112165308.1618107-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.11 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/14/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/a4a4d8f3386a0e32ecbd808689561c70747fcb71 Thanks. Luca Boccassi --- >From a4a4d8f3386a0e32ecbd808689561c70747fcb71 Mon Sep 17 00:00:00 2001 From: Adrian Schollmeyer Date: Thu, 30 Oct 2025 10:13:13 +0100 Subject: [PATCH] net/mlx5: store MTU at Rx queue allocation time [ upstream commit 4414eb800708475bf1b38794434e590c7204d9d3 ] For shared Rx queues, equal MTU for all ports sharing queues is enforced using mlx5_shared_rxq_match() to make sure, the memory allocated in the Rx buffer is large enough. The check uses the MTU as reported by the ports' private dev_data structs, which contain the MTU currently set for the device. In case one port's MTU is altered after Rx queues are allocated and then a second port joins the shared Rx queue with the old, yet correct MTU, the check fails despite the fact that the Rx buffer size is correct for both ports. This patch adds a new entry to the Rx queue control structure that captures the MTU at the time the Rx buffer was allocated, since this is the relevant information that needs to be checked when a port joins a shared Rx queue. Fixes: 09c2555303be ("net/mlx5: support shared Rx queue") Signed-off-by: Adrian Schollmeyer Acked-by: Dariusz Sosnowski --- .mailmap | 1 + drivers/net/mlx5/mlx5_rx.h | 1 + drivers/net/mlx5/mlx5_rxq.c | 6 +++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index ddc091adac..f59db4fb3a 100644 --- a/.mailmap +++ b/.mailmap @@ -18,6 +18,7 @@ Adam Ludkiewicz Adham Masarwah Adrian Moreno Adrian Podlawski +Adrian Schollmeyer Adrien Mazarguil Ady Agbarih Agalya Babu RadhaKrishnan diff --git a/drivers/net/mlx5/mlx5_rx.h b/drivers/net/mlx5/mlx5_rx.h index 588d83a073..1467e1dd49 100644 --- a/drivers/net/mlx5/mlx5_rx.h +++ b/drivers/net/mlx5/mlx5_rx.h @@ -154,6 +154,7 @@ struct mlx5_rxq_data { /* RX queue control descriptor. */ struct mlx5_rxq_ctrl { struct mlx5_rxq_data rxq; /* Data path structure. */ + uint16_t mtu; /* Original MTU that the queue was allocated with. */ LIST_ENTRY(mlx5_rxq_ctrl) next; /* Pointer to the next element. */ LIST_HEAD(priv, mlx5_rxq_priv) owners; /* Owner rxq list. */ struct mlx5_rxq_obj *obj; /* Verbs/DevX elements. */ diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c index b1834aac7c..040273486f 100644 --- a/drivers/net/mlx5/mlx5_rxq.c +++ b/drivers/net/mlx5/mlx5_rxq.c @@ -776,7 +776,7 @@ mlx5_shared_rxq_match(struct mlx5_rxq_ctrl *rxq_ctrl, struct rte_eth_dev *dev, dev->data->port_id, idx); return false; } - if (priv->mtu != spriv->mtu) { + if (priv->mtu != rxq_ctrl->mtu) { DRV_LOG(ERR, "port %u queue index %u failed to join shared group: mtu mismatch", dev->data->port_id, idx); return false; @@ -1765,6 +1765,10 @@ mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, } LIST_INIT(&tmpl->owners); MLX5_ASSERT(n_seg && n_seg <= MLX5_MAX_RXQ_NSEG); + /* + * Save the original MTU to check against for shared rx queues. + */ + tmpl->mtu = dev->data->mtu; /* * Save the original segment configuration in the shared queue * descriptor for the later check on the sibling queue creation. -- 2.47.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-11-12 16:20:42.402144512 +0000 +++ 0038-net-mlx5-store-MTU-at-Rx-queue-allocation-time.patch 2025-11-12 16:20:40.971718030 +0000 @@ -1 +1 @@ -From 4414eb800708475bf1b38794434e590c7204d9d3 Mon Sep 17 00:00:00 2001 +From a4a4d8f3386a0e32ecbd808689561c70747fcb71 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4414eb800708475bf1b38794434e590c7204d9d3 ] + @@ -21 +22,0 @@ -Cc: stable@dpdk.org @@ -32 +33 @@ -index 1fb3fb5128..50a59a596a 100644 +index ddc091adac..f59db4fb3a 100644 @@ -35 +36,2 @@ -@@ -21,6 +21,7 @@ Adham Masarwah +@@ -18,6 +18,7 @@ Adam Ludkiewicz + Adham Masarwah @@ -37 +38,0 @@ - Adrian Pielech @@ -44 +45 @@ -index 7be31066a5..127abe41fb 100644 +index 588d83a073..1467e1dd49 100644 @@ -47 +48 @@ -@@ -176,6 +176,7 @@ struct __rte_cache_aligned mlx5_rxq_data { +@@ -154,6 +154,7 @@ struct mlx5_rxq_data { @@ -56 +57 @@ -index 1425886a22..2264dea877 100644 +index b1834aac7c..040273486f 100644 @@ -59 +60 @@ -@@ -780,7 +780,7 @@ mlx5_shared_rxq_match(struct mlx5_rxq_ctrl *rxq_ctrl, struct rte_eth_dev *dev, +@@ -776,7 +776,7 @@ mlx5_shared_rxq_match(struct mlx5_rxq_ctrl *rxq_ctrl, struct rte_eth_dev *dev, @@ -68 +69 @@ -@@ -1812,6 +1812,10 @@ mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, +@@ -1765,6 +1765,10 @@ mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,