From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3E2A6A0527 for ; Mon, 9 Nov 2020 19:45:27 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 37C156883; Mon, 9 Nov 2020 19:45:26 +0100 (CET) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id B80EF6883 for ; Mon, 9 Nov 2020 19:45:24 +0100 (CET) Received: by mail-wm1-f67.google.com with SMTP id a65so454574wme.1 for ; Mon, 09 Nov 2020 10:45:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Tgild+jKnybEaVnngmiYCZeak+BBZxGGZnlY94Uv2L4=; b=HGx0HpRU/yas6mSOl6XXZ4zt7JUhQdqOtnPb5Rp1IG0nRWeeYdg5P/8zkvMtckKYVu yz/FnsyqD6Mp54svOmy+x9sCkDKuNmEeznH/GwsnJMQiWIdIiY2b3/FGsuyCM2cFFDRj FHstNeEyrdRpvNignoePZ58Uu3QS8lWLqxq25kTudzm+j9NdIjXQOe2dwlo1UxSyLWf8 IofgR5hhY/ZI+pNW9ESbAwRfpWKIyR1cg8xbrXxMZWNDyz7R87M+xNNSUBN/PDUeIlb0 soosYGWfB+0nSweRIkwO6sZfMrXSflolE2s4rjqJLVmfhiQt76IiDI3Da1zn3C1bAq1/ ISig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Tgild+jKnybEaVnngmiYCZeak+BBZxGGZnlY94Uv2L4=; b=KJugaFfrmGYMN6xBqrYm2sjFx0777zH0Pu6kZtCUCSz9ge/NzThngdurCihNad0WVZ bZ2t3uhINikode7yfsR3J9+/Qt8UdUQgRzZ2mXebTOswfmnSeS0SGhmb4Foa4z39lEzR +dTGU77UdlFgIDGR72GI0HlZeIFwly4smBtCOVpeUQyqjetMzYS8dkp6Ut8cn3+2BqfK 1344jhag73aBaWEaMX7/amXQzlmZA4kKRGlfxuZ0+uMRCXpKYTkkxsiJEqLGwIjgHRZX Sa4xFX/FphtsEER6P6GMC+VEIw/oaylbd3HhX5RxYJVACccCXjTd4MI8Yn7bkhhZMtHJ 1MZA== X-Gm-Message-State: AOAM530g6qUGWWGYi+lrkZB58ca6WKdf6e+nX0Oh1W/IOiBaOxTee1HR EpDzWfG6v0TY5tM87unmpfCoEtM8dYq2t3AC X-Google-Smtp-Source: ABdhPJxOhVgWTNcYMzmry/8vwG+7xZD3u7GX8viLjMAFB9CZTuTGPPBHZ3V6IIX2qLE0x7AI/qdJtg== X-Received: by 2002:a1c:80cb:: with SMTP id b194mr541433wmd.73.1604947523478; Mon, 09 Nov 2020 10:45:23 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id l13sm2705753wrm.24.2020.11.09.10.45.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 10:45:22 -0800 (PST) From: luca.boccassi@gmail.com To: Tal Shnaiderman Cc: Matan Azrad , dpdk stable Date: Mon, 9 Nov 2020 18:40:59 +0000 Message-Id: <20201109184111.3463090-71-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201109184111.3463090-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-207-luca.boccassi@gmail.com> <20201109184111.3463090-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'common/mlx5: fix DevX SQ object creation' has been queued to stable release 19.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.6 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/11/20. 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/060f17455ae84de71cd072cf2fdeb9a8536e087e Thanks. Luca Boccassi --- >From 060f17455ae84de71cd072cf2fdeb9a8536e087e Mon Sep 17 00:00:00 2001 From: Tal Shnaiderman Date: Mon, 26 Oct 2020 20:17:48 +0200 Subject: [PATCH] common/mlx5: fix DevX SQ object creation [ upstream commit 1912d158e1db1098fb81982dbb6013c213326837 ] Fix wrong assignment of allow_multi_pkt_send_wqe in mlx5_devx_cmd_create_sq. The incorrect assignment was introduced in the initial mlx5_devx_cmd_create_sq implementation. sq_attr->flush_in_error_en is mistakenly assigned to both allow_multi_pkt_send_wqe and flush_in_error_en, it was detected during Windows PMD development. The fix is simply assigning the right value in mlx5_devx_cmd_create_sq to sq_attr->allow_multi_pkt_send_wqe Fixes: ae18a1ae9692 ("net/mlx5: support Tx hairpin queues") Signed-off-by: Tal Shnaiderman Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_devx_cmds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_devx_cmds.c b/drivers/net/mlx5/mlx5_devx_cmds.c index e223ee9b18..f9c4043c11 100644 --- a/drivers/net/mlx5/mlx5_devx_cmds.c +++ b/drivers/net/mlx5/mlx5_devx_cmds.c @@ -778,7 +778,7 @@ mlx5_devx_cmd_create_sq(struct ibv_context *ctx, MLX5_SET(sqc, sq_ctx, fre, sq_attr->fre); MLX5_SET(sqc, sq_ctx, flush_in_error_en, sq_attr->flush_in_error_en); MLX5_SET(sqc, sq_ctx, allow_multi_pkt_send_wqe, - sq_attr->flush_in_error_en); + sq_attr->allow_multi_pkt_send_wqe); MLX5_SET(sqc, sq_ctx, min_wqe_inline_mode, sq_attr->min_wqe_inline_mode); MLX5_SET(sqc, sq_ctx, state, sq_attr->state); -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-09 18:40:13.829205057 +0000 +++ 0071-common-mlx5-fix-DevX-SQ-object-creation.patch 2020-11-09 18:40:11.215312589 +0000 @@ -1 +1 @@ -From 1912d158e1db1098fb81982dbb6013c213326837 Mon Sep 17 00:00:00 2001 +From 060f17455ae84de71cd072cf2fdeb9a8536e087e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1912d158e1db1098fb81982dbb6013c213326837 ] + @@ -19 +20,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ - drivers/common/mlx5/mlx5_devx_cmds.c | 2 +- + drivers/net/mlx5/mlx5_devx_cmds.c | 2 +- @@ -27,5 +28,5 @@ -diff --git a/drivers/common/mlx5/mlx5_devx_cmds.c b/drivers/common/mlx5/mlx5_devx_cmds.c -index 5b0f8a8654..a13febebfd 100644 ---- a/drivers/common/mlx5/mlx5_devx_cmds.c -+++ b/drivers/common/mlx5/mlx5_devx_cmds.c -@@ -1333,7 +1333,7 @@ mlx5_devx_cmd_create_sq(void *ctx, +diff --git a/drivers/net/mlx5/mlx5_devx_cmds.c b/drivers/net/mlx5/mlx5_devx_cmds.c +index e223ee9b18..f9c4043c11 100644 +--- a/drivers/net/mlx5/mlx5_devx_cmds.c ++++ b/drivers/net/mlx5/mlx5_devx_cmds.c +@@ -778,7 +778,7 @@ mlx5_devx_cmd_create_sq(struct ibv_context *ctx,