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 296B0A0350 for ; Mon, 21 Feb 2022 16:39:13 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2417A4013F; Mon, 21 Feb 2022 16:39:13 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 852C64013F for ; Mon, 21 Feb 2022 16:39:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645457951; 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=ci4j0+t+Ahcpw5OQaksvaqWRyNvBaX5t/ayS0511NDU=; b=MKl+T0wwq07L0XoejBRxDbOh3tLXqfF+GQ7OMT892mDErGYB/zYr1G9HaWTUOosW8Zjpga GxXg++r9kUMv+S1vdB2kentBftX5VXGPWRk0TsRU32Teo1XF7gyh412l9aqfK2/yF2wrY5 aXYTVlh3UYynrAqjMtsprcizV1cJJpg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-490-SvzYt5T1P761egr0s_7SQA-1; Mon, 21 Feb 2022 10:39:05 -0500 X-MC-Unique: SvzYt5T1P761egr0s_7SQA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BFF24100C660; Mon, 21 Feb 2022 15:39:04 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id B92B378DDE; Mon, 21 Feb 2022 15:39:03 +0000 (UTC) From: Kevin Traynor To: Alexander Kozyrev Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix MPRQ WQE size assertion' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:34:28 +0000 Message-Id: <20220221153625.152324-79-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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.1 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/26/22. 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/85d9e45c32ee046eea992a0cf57d1c8efcc5a144 Thanks. Kevin --- >From 85d9e45c32ee046eea992a0cf57d1c8efcc5a144 Mon Sep 17 00:00:00 2001 From: Alexander Kozyrev Date: Thu, 13 Jan 2022 16:36:09 +0200 Subject: [PATCH] net/mlx5: fix MPRQ WQE size assertion [ upstream commit 728b6447e766fc0aaf59e888635d62d54e77a528 ] Preparation of the stride size and the number of strides for Multi-Packet RQ was updated recently to accommodate the hardware limitation about minimum WQE size. The wrong assertion was introduced to ensure this limitation is met. Assert that the configured WQE size is not less than the minimum supported size. Fixes: 34776af600df ("net/mlx5: fix MPRQ stride devargs adjustment") Signed-off-by: Alexander Kozyrev Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_rxq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c index ee07c610b9..580d7ae868 100644 --- a/drivers/net/mlx5/mlx5_rxq.c +++ b/drivers/net/mlx5/mlx5_rxq.c @@ -1620,5 +1620,5 @@ mlx5_mprq_prepare(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, log_stride_wqe_size = log_def_stride_num + log_def_stride_size; } - MLX5_ASSERT(log_stride_wqe_size < config->mprq.log_min_stride_wqe_size); + MLX5_ASSERT(log_stride_wqe_size >= config->mprq.log_min_stride_wqe_size); if (desc <= RTE_BIT32(*actual_log_stride_num)) goto unsupport; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:46.358195316 +0000 +++ 0079-net-mlx5-fix-MPRQ-WQE-size-assertion.patch 2022-02-21 15:22:44.171704306 +0000 @@ -1 +1 @@ -From 728b6447e766fc0aaf59e888635d62d54e77a528 Mon Sep 17 00:00:00 2001 +From 85d9e45c32ee046eea992a0cf57d1c8efcc5a144 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 728b6447e766fc0aaf59e888635d62d54e77a528 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org