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 9798142DA6 for ; Sat, 15 Jul 2023 00:35:16 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 91A3D40EDC; Sat, 15 Jul 2023 00:35:16 +0200 (CEST) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mails.dpdk.org (Postfix) with ESMTP id E77AA40DFB for ; Sat, 15 Jul 2023 00:35:15 +0200 (CEST) Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-314313f127fso2501215f8f.1 for ; Fri, 14 Jul 2023 15:35:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689374115; x=1691966115; 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=+foWeCrisZxCuxH7H9xItMvoJwCNOcINlwIaam4MKyc=; b=eGVBl5x9rS4U8EriXhB0KgNO8KFPu6Q+odq0AMPFAI13GNsXubKB31TyoKYqDj20IB sgf0+EXoSOSyARgisaKz9SMSr/kTaS7Ziy2JG3XzGwdw2pHpgnxvc+m0XDx60KfYssgB 2eY71w9zSqxCnXHMsR5TIqS6yrhcQf8JCfi2kmb3y33hLnHK7+RPetbtLoJAD4SDZggS egr8zDxSqXkyIZss+5fIDEt8lFHZIE8AbsQhQDrg7QQrS74eD9U8ZQgLaVL4MAeM8R9s kE3uFjPfPydTgUrVkpafu6apqv5KjtHckhgggOyTCkk5XTx0RVqcTx++KZRcf2EEz7FC ef3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689374115; x=1691966115; 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=+foWeCrisZxCuxH7H9xItMvoJwCNOcINlwIaam4MKyc=; b=QLFn11egscjs7vjsrN1fJLCPimc9mnNS98AUGmbna/F1+O+LtM/V1GXU4ePsLFTVrs RY/ro0/P0RCns8/EXp8Wrca5OWr8yNFqD+YaXzZMyzwoMNFgP+pBZ8iDOpzp7qLAbBQD tzPk2X4K7dysC23uOxXUU9da4d1Q2XmjsYSH6UBv+H9cjQtGqSObc6EDws5u6eiy54oP 70hz/qLovjiL3isNOfHsBeuHalgJ3iJ9RzoC3UGuUbPsswKLIUnZ3LTcArkQVzgCVGMR wH5iQ12/beFMVTk/wj32iA5pVq+DGzVDr0JZnHrk9ViMYkFw0425wbPiJVSrOYSWzAIA t6CA== X-Gm-Message-State: ABy/qLY/Nqa/jldNMWDJ3TiavfwQtvQzPJvnXljY3o11xs2rMyBw9093 9wv1rytt+61A6aUcOJyeO4N8OolUcXxxEAA8 X-Google-Smtp-Source: APBJJlFVbNyct8EW66EHBBuTXKl9FcTa96xdE+GsYQL2QltLKIZNGV8xvd0OD8obbq+qMsd+SMPtWQ== X-Received: by 2002:adf:e60f:0:b0:314:1ad7:2ea8 with SMTP id p15-20020adfe60f000000b003141ad72ea8mr4885323wrm.54.1689374115608; Fri, 14 Jul 2023 15:35:15 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id g15-20020a5d554f000000b0031411e46af3sm11912000wrw.97.2023.07.14.15.35.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jul 2023 15:35:15 -0700 (PDT) From: luca.boccassi@gmail.com To: Alexander Kozyrev Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: forbid MPRQ restart' has been queued to stable release 20.11.9 Date: Fri, 14 Jul 2023 23:34:38 +0100 Message-Id: <20230714223447.1092828-9-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230714223447.1092828-1-luca.boccassi@gmail.com> References: <20230628141046.2145871-22-luca.boccassi@gmail.com> <20230714223447.1092828-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 20.11.9 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/16/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/cd1033d5d5b2403684b51a2b926b5fba8ab1dcea Thanks. Luca Boccassi --- >From cd1033d5d5b2403684b51a2b926b5fba8ab1dcea 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 5d659738fe..47db585042 100644 --- a/drivers/net/mlx5/mlx5_rxq.c +++ b/drivers/net/mlx5/mlx5_rxq.c @@ -579,12 +579,12 @@ mlx5_rx_queue_stop(struct rte_eth_dev *dev, uint16_t idx) * synchronized, that might be broken on RQ restart * 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.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-14 23:33:08.871153623 +0100 +++ 0009-net-mlx5-forbid-MPRQ-restart.patch 2023-07-14 23:33:08.491305191 +0100 @@ -1 +1 @@ -From f0b2d50e2c6c02555b7fbe77f909bd7f1c6ac2e4 Mon Sep 17 00:00:00 2001 +From cd1033d5d5b2403684b51a2b926b5fba8ab1dcea 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 5d659738fe..47db585042 100644 @@ -24 +25 @@ -@@ -531,12 +531,12 @@ mlx5_rx_queue_stop(struct rte_eth_dev *dev, uint16_t idx) +@@ -579,12 +579,12 @@ mlx5_rx_queue_stop(struct rte_eth_dev *dev, uint16_t idx)