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 C491243337 for ; Wed, 15 Nov 2023 12:46:00 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BE5EA40A4B; Wed, 15 Nov 2023 12:46:00 +0100 (CET) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mails.dpdk.org (Postfix) with ESMTP id 79E4940285 for ; Wed, 15 Nov 2023 12:45:59 +0100 (CET) Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-408382da7f0so55053745e9.0 for ; Wed, 15 Nov 2023 03:45:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700048759; x=1700653559; 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=gOnsHgtxKEIg1jEF+EcsOkoveWpkyoqr+SMKEPdbTNA=; b=lbOcRUxy9fUkB/y4sgxFj5fIVh4XxZWePxYd5oHJ32XfuJVTPUnaYkdPlrRygpIpgo fmOQuIHnfOH49ohfyj3vRMvtZ+fUHh3C43UCFXrYrfYPrbMbUclMzV10VJ/EEI8SlV9Y 4edpc29nj92U/VvJ9URQ/KHS+OFrQ/Ei+VzBFVrDL19yWQT7a0dFa3zKX21Lpc/Pm5w7 06RkbvQE4szgP6IX6YmOCfnAUgWDzdB4Z+jwwClpFMZEVNaYXdwsgqISTkGVgkVvCpgt 4+0LyQZCpdvqrraYl0i1Iu57WqZFfLB6OYlhG77LAeJzPJeFUYGJ8JCl8W5aU1K5JJF7 cGBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700048759; x=1700653559; 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=gOnsHgtxKEIg1jEF+EcsOkoveWpkyoqr+SMKEPdbTNA=; b=BzJ9xJNKs1xO2xqMtVNQkmpiL/m0HA8IgExcIZ509uYff+WCiZKc7c6QB42MWv2XBf ueKqG5pc9JmX6pTNXMi9+rL+q1QWxhb7iFFXCwrFbgch56yl1a1JhJEssly1vYjUlwCC vbHEACr4+QjZ4M4YzrnbGuuQaKVnfemN469ETqGi3QFOrVeii52pI4CnLYXmrCSWawcs Fs1wPhy37Lqou1ox33IXGFb1oWFK9hJ4kr5JajRsdxO4PqyAxAgcZz0/DgSlYp3c8iBV IrCr0Ncw25WB4lC369lP/0RXWxtlp5aPlNpzUm0uPEcPSJ+sFD+IrCN79UEzvYmy+bA/ jxhQ== X-Gm-Message-State: AOJu0YyLyuI1aDRdNOt+O8JS+Bs+HUdOI+eYz57HwbEGzLFcUkl3LqO0 4p5DtcP6OBPObmqOu0A3Ovwi1wLP8AK7zQ== X-Google-Smtp-Source: AGHT+IEyDOlO2LtipuBRn/Ipfc/xkyIG7Cb5i8A1sQoxjnvH6VRrGo6LaTipNeEJfR4Hk+pZaE39OA== X-Received: by 2002:a05:600c:894:b0:40a:44c0:fd43 with SMTP id l20-20020a05600c089400b0040a44c0fd43mr10204906wmp.17.1700048759179; Wed, 15 Nov 2023 03:45:59 -0800 (PST) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id p17-20020a05600c469100b004064e3b94afsm20821476wmo.4.2023.11.15.03.45.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 03:45:58 -0800 (PST) From: luca.boccassi@gmail.com To: Dariusz Sosnowski Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix hairpin queue states' has been queued to stable release 20.11.10 Date: Wed, 15 Nov 2023 11:45:12 +0000 Message-Id: <20231115114515.2355140-13-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231115114515.2355140-1-luca.boccassi@gmail.com> References: <20231108192535.922238-37-luca.boccassi@gmail.com> <20231115114515.2355140-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.10 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/17/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/9f2170bdf8017393841e016f202e047efd92873f Thanks. Luca Boccassi --- >From 9f2170bdf8017393841e016f202e047efd92873f Mon Sep 17 00:00:00 2001 From: Dariusz Sosnowski Date: Thu, 9 Nov 2023 20:04:25 +0200 Subject: [PATCH] net/mlx5: fix hairpin queue states [ upstream commit ca638c49e402c930bbe20979c7f5aa2bd6bc0a5a ] This patch fixes the expected SQ and RQ states used in MODIFY_SQ and MODIFY_RQ during unbinding of the hairpin queues. When unbinding the queue objects, they are in RDY state and are transitioning to RST state, instead of going from RST to RST state. Also, this patch fixes the constants used for RQ states. Instead of MLX5_SQC_STATE_*, now MLX5_RQC_STATE_* are used. Fixes: 6a338ad4f7fe ("net/mlx5: add hairpin binding function") Fixes: 37cd4501e873 ("net/mlx5: support two ports hairpin mode") Signed-off-by: Dariusz Sosnowski Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_trigger.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c index fb61094e45..3ca956e21d 100644 --- a/drivers/net/mlx5/mlx5_trigger.c +++ b/drivers/net/mlx5/mlx5_trigger.c @@ -310,8 +310,8 @@ mlx5_hairpin_auto_bind(struct rte_eth_dev *dev) ret = mlx5_devx_cmd_modify_sq(sq, &sq_attr); if (ret) goto error; - rq_attr.state = MLX5_SQC_STATE_RDY; - rq_attr.rq_state = MLX5_SQC_STATE_RST; + rq_attr.state = MLX5_RQC_STATE_RDY; + rq_attr.rq_state = MLX5_RQC_STATE_RST; rq_attr.hairpin_peer_sq = sq->id; rq_attr.hairpin_peer_vhca = priv->config.hca_attr.vhca_id; ret = mlx5_devx_cmd_modify_rq(rq, &rq_attr); @@ -572,8 +572,8 @@ mlx5_hairpin_queue_peer_bind(struct rte_eth_dev *dev, uint16_t cur_queue, mlx5_rxq_release(dev, cur_queue); return -rte_errno; } - rq_attr.state = MLX5_SQC_STATE_RDY; - rq_attr.rq_state = MLX5_SQC_STATE_RST; + rq_attr.state = MLX5_RQC_STATE_RDY; + rq_attr.rq_state = MLX5_RQC_STATE_RST; rq_attr.hairpin_peer_sq = peer_info->qp_id; rq_attr.hairpin_peer_vhca = peer_info->vhca_id; ret = mlx5_devx_cmd_modify_rq(rxq_ctrl->obj->rq, &rq_attr); @@ -638,7 +638,7 @@ mlx5_hairpin_queue_peer_unbind(struct rte_eth_dev *dev, uint16_t cur_queue, return -rte_errno; } sq_attr.state = MLX5_SQC_STATE_RST; - sq_attr.sq_state = MLX5_SQC_STATE_RST; + sq_attr.sq_state = MLX5_SQC_STATE_RDY; ret = mlx5_devx_cmd_modify_sq(txq_ctrl->obj->sq, &sq_attr); if (ret == 0) txq_ctrl->hairpin_status = 0; @@ -674,8 +674,8 @@ mlx5_hairpin_queue_peer_unbind(struct rte_eth_dev *dev, uint16_t cur_queue, mlx5_rxq_release(dev, cur_queue); return -rte_errno; } - rq_attr.state = MLX5_SQC_STATE_RST; - rq_attr.rq_state = MLX5_SQC_STATE_RST; + rq_attr.state = MLX5_RQC_STATE_RST; + rq_attr.rq_state = MLX5_RQC_STATE_RDY; ret = mlx5_devx_cmd_modify_rq(rxq_ctrl->obj->rq, &rq_attr); if (ret == 0) rxq_ctrl->hairpin_status = 0; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-15 11:44:14.160743176 +0000 +++ 0013-net-mlx5-fix-hairpin-queue-states.patch 2023-11-15 11:44:13.602388184 +0000 @@ -1 +1 @@ -From ca638c49e402c930bbe20979c7f5aa2bd6bc0a5a Mon Sep 17 00:00:00 2001 +From 9f2170bdf8017393841e016f202e047efd92873f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ca638c49e402c930bbe20979c7f5aa2bd6bc0a5a ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index 4b5becc10c..35733b0604 100644 +index fb61094e45..3ca956e21d 100644 @@ -28 +29 @@ -@@ -346,8 +346,8 @@ mlx5_hairpin_auto_bind(struct rte_eth_dev *dev) +@@ -310,8 +310,8 @@ mlx5_hairpin_auto_bind(struct rte_eth_dev *dev) @@ -37,4 +38,4 @@ - rq_attr.hairpin_peer_vhca = - priv->sh->cdev->config.hca_attr.vhca_id; -@@ -601,8 +601,8 @@ mlx5_hairpin_queue_peer_bind(struct rte_eth_dev *dev, uint16_t cur_queue, - " mismatch", dev->data->port_id, cur_queue); + rq_attr.hairpin_peer_vhca = priv->config.hca_attr.vhca_id; + ret = mlx5_devx_cmd_modify_rq(rq, &rq_attr); +@@ -572,8 +572,8 @@ mlx5_hairpin_queue_peer_bind(struct rte_eth_dev *dev, uint16_t cur_queue, + mlx5_rxq_release(dev, cur_queue); @@ -50 +51 @@ -@@ -666,7 +666,7 @@ mlx5_hairpin_queue_peer_unbind(struct rte_eth_dev *dev, uint16_t cur_queue, +@@ -638,7 +638,7 @@ mlx5_hairpin_queue_peer_unbind(struct rte_eth_dev *dev, uint16_t cur_queue, @@ -59,2 +60,2 @@ -@@ -700,8 +700,8 @@ mlx5_hairpin_queue_peer_unbind(struct rte_eth_dev *dev, uint16_t cur_queue, - dev->data->port_id, cur_queue); +@@ -674,8 +674,8 @@ mlx5_hairpin_queue_peer_unbind(struct rte_eth_dev *dev, uint16_t cur_queue, + mlx5_rxq_release(dev, cur_queue); @@ -69 +70 @@ - rxq->hairpin_status = 0; + rxq_ctrl->hairpin_status = 0;