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 DBCEF42ECF for ; Thu, 20 Jul 2023 17:23:41 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D7E0740685; Thu, 20 Jul 2023 17:23:41 +0200 (CEST) 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 9C776400D6 for ; Thu, 20 Jul 2023 17:23:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866620; 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=s5BLeeMUy+/BXek+cav/YVOp7JFgVsMyYu+Mha0/skw=; b=WnD0N6Or5OrGHnybiwzjQwlqWll2TJjl1tNnKwktyuE59XBi9b1/wtS7xmsiFaQnPmzZBT pC65xtVHG6HFZikCCJZFtadZziKtAlJAG3grfFo1BwI2cI+QdQDc6GKuehK9l423qxHzS+ mV8fjVLwhzLbZxQZieRJllXGUQafzuw= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-621-cziCOU_zMmKPTI5Xa1ILiQ-1; Thu, 20 Jul 2023 11:23:35 -0400 X-MC-Unique: cziCOU_zMmKPTI5Xa1ILiQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C1C79185A78F; Thu, 20 Jul 2023 15:23:10 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id D1EB3492C13; Thu, 20 Jul 2023 15:23:09 +0000 (UTC) From: Kevin Traynor To: Alexander Kozyrev Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: forbid MPRQ restart' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:19:18 +0100 Message-ID: <20230720151942.262154-127-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/23. 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/26838c1cb1bff04c07c52135bdc8c79aeae0fad4 Thanks. Kevin --- >From 26838c1cb1bff04c07c52135bdc8c79aeae0fad4 Mon Sep 17 00:00:00 2001 From: Alexander Kozyrev Date: Tue, 4 Jul 2023 00:22:24 +0300 Subject: [PATCH] net/mlx5: forbid MPRQ restart [ upstream commit f0b2d50e2c6c02555b7fbe77f909bd7f1c6ac2e4 ] The queue restart is only supported by the non-vectorized single-packet receive queue today. Restarting MPRQ will result in corrupted packets because of CQE and WQE mismatch. Prevent this by not allowing the MPRQ Rx queue stop. Fixes: 161d103b231c ("net/mlx5: add queue start and stop") Signed-off-by: Alexander Kozyrev Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_rxq.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c index 6bc89a2e5c..12cde2af9c 100644 --- a/drivers/net/mlx5/mlx5_rxq.c +++ b/drivers/net/mlx5/mlx5_rxq.c @@ -529,10 +529,10 @@ mlx5_rx_queue_stop(struct rte_eth_dev *dev, uint16_t idx) * and cause Rx malfunction, so queue stopping is * not supported if vectorized Rx burst is engaged. - * The routine pointer depends on the process - * type, should perform check there. + * The routine pointer depends on the process type, + * should perform check there. MPRQ is not supported as well. */ - if (pkt_burst == mlx5_rx_burst_vec) { - DRV_LOG(ERR, "Rx queue stop is not supported " - "for vectorized Rx"); + if (pkt_burst != mlx5_rx_burst) { + DRV_LOG(ERR, "Rx queue stop is only supported " + "for non-vectorized single-packet Rx"); rte_errno = EINVAL; return -EINVAL; -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:10.266257278 +0100 +++ 0127-net-mlx5-forbid-MPRQ-restart.patch 2023-07-20 16:17:55.182752636 +0100 @@ -1 +1 @@ -From f0b2d50e2c6c02555b7fbe77f909bd7f1c6ac2e4 Mon Sep 17 00:00:00 2001 +From 26838c1cb1bff04c07c52135bdc8c79aeae0fad4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f0b2d50e2c6c02555b7fbe77f909bd7f1c6ac2e4 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index ad8fd13cbe..b314c0482b 100644 +index 6bc89a2e5c..12cde2af9c 100644 @@ -24 +25 @@ -@@ -532,10 +532,10 @@ mlx5_rx_queue_stop(struct rte_eth_dev *dev, uint16_t idx) +@@ -529,10 +529,10 @@ mlx5_rx_queue_stop(struct rte_eth_dev *dev, uint16_t idx)