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 DB27E433D8 for ; Mon, 11 Dec 2023 11:21:07 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D289D40ED2; Mon, 11 Dec 2023 11:21:07 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2077.outbound.protection.outlook.com [40.107.220.77]) by mails.dpdk.org (Postfix) with ESMTP id 132CC40E0F for ; Mon, 11 Dec 2023 11:21:06 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BnpWZjYNIA+NwAUbIblszz77Iw+FVTeEZlzoBLhHUKv9Jk1eQJ/lJwBVMA7lxNvPwhsEbE+yTP7RbXx4S5xnZlAZPtjVzb3rRDwayDVkggCxwQ8ULk9U21wsq70DJ8HLqPyVpSWrvW5GTT4s6HddxgAJ+dS6XM0dBM7Nzx9M1vI+sUGoLV9RSed8qaGbnWsnDDZPoVASScP6xCh/ldz+lK1njy1FWqhYCZMshvGo6IKTSK7LG93vSuzYj/qXHvIlOfXKHTMR4Q6fh1hMEgmjX5E2ihifm1sE6a0253jbS959D3JWwQZCmeqladcZsbogFjxqGGqc/b/gbjpqMbV5MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7jbhQJwhSat8qHuPTpR1B5vnfJsDOiOH8B8n8DRFyUk=; b=RhkhrmBWKByDm4/7nrRpDWRXudG8XUQx0m0mWaTbqmyTYg/dhLZGhip7UBQIa7JPfWAOoxR5LtpbpVkdvvyIgdn4cZBfkpe+LAFSeTBbP16l7nJi+AzIUwkVfv8P0nySDxiGxEFv49fG7Dm9YtNAtbSojuzcuUD10Gz82aU+LKvmp9ZCjkqWMexEkFBqd8awUe2J6ZaBFXLJmG0Y1hwaPAwB7jEeDLhHXuolwVZs9bju/9lbM6aB9ezOHQt8xv3k6JL7Es8+rqZ3mf1PWQV2eVNgW4pHbH8M3ZrtPkGf+0m6ZO5MPwu7RznM5GcUT6vnexqNBNMCYI1V0fB5IlgP+w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7jbhQJwhSat8qHuPTpR1B5vnfJsDOiOH8B8n8DRFyUk=; b=Ix2kaRvsP7DUIn1WPtwEAANL/B4BNs23f/tPaKTehd8wKSWx/tOX6y0MRxMmatyCUs6cUTnUOSbFdd/o0va6xDXH5QGzM3550Scyggh7wilRRiUVQPu0OddXkh6JkpA0uIGti4qYd31n06HHAg874sTeIVshwdwx4cCxTTqern92YimZzJ+1/8zqMVCrCfYL4TB52hwMOZSrg6AoQpcUgvQBKMt8X02X+NnkAjhzqPxnaKF4cHvINFHoMtGWQapl64rGokjoOsuTP9+5tfnn7nO2sXZzG6j0Tf5+qXefxi5Pgv1iz1tYz5FuTBe08LsKojCfD1ypEFfb6TGSyzxwXA== Received: from DS7PR03CA0336.namprd03.prod.outlook.com (2603:10b6:8:55::20) by CH3PR12MB7570.namprd12.prod.outlook.com (2603:10b6:610:149::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32; Mon, 11 Dec 2023 10:21:03 +0000 Received: from CY4PEPF0000EE38.namprd03.prod.outlook.com (2603:10b6:8:55:cafe::e) by DS7PR03CA0336.outlook.office365.com (2603:10b6:8:55::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33 via Frontend Transport; Mon, 11 Dec 2023 10:21:03 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CY4PEPF0000EE38.mail.protection.outlook.com (10.167.242.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.18 via Frontend Transport; Mon, 11 Dec 2023 10:21:03 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 11 Dec 2023 02:20:49 -0800 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 11 Dec 2023 02:20:47 -0800 From: Xueming Li To: Dariusz Sosnowski CC: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix hairpin queue states' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:11:56 +0800 Message-ID: <20231211101226.2122-92-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231211101226.2122-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> <20231211101226.2122-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE38:EE_|CH3PR12MB7570:EE_ X-MS-Office365-Filtering-Correlation-Id: 24c77a8b-85b3-49c8-6c46-08dbfa32e115 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cDhbRdV+nabOG8Gn4ez+TKfVLkvXk0tjhBoDn8JACyAbE0IMnLWucSAiTyw2QgCMERzgkdAABGifKs/R9+8afMTFP0fAJv3UknI9CBn/2hn4ylcsFiCHcI0+991EjTwm/Gt8rQSkytQeC3kKFvP1dbaa9s0RYIRuBg+9cVE0sVj2joVoY1GWb/ElIS7ySqWBj9UHzciZ9l+PXuuzaQqUv0sEd1dPtUCmRmh/LzkdIiw98iTh+Oi9z+6AM3BdefcXbfAltHvbAAQG999toOAj/5a8xVtLfh4lgYXdHXyxGCtKj6bG6SEJGI8cK6uCkuVFYwJnzCUhw2v/kT5U/coyJoIMxj3zKJ6wErU5zespEkn77c8CTVM+T7dVhl2HPmklinAXFcDAvcO+UxyPU+7anEwsnB+V0U58YDmyzfc1f3jlteffh9gNBB3toXcBq4Onxab7d+ykV/pZdhqkrGAl/EG6hzgh33W+UNP3m7quYSsjLp5OoRqB1MpTBYtzSzFpuRUfpUeKeAgcyOGw2JIfWIgT1ViSrz9edrk13c77BzEsEynJR/T7ZM63wNa8ZF3TFbUBKlmOz1y2ISEfsNS7clJmx6WOZJsm3zwRxrAed7oy/clv7uyIiac6k9rlYi0+wpT4x3i9pP0N+MMpkwpO3G50nUnYuwfTKL/Mb777fWH2i8uwpYTqvFX/YaTSKsR2knjGYVvj+vxuWrP90acFfP6v8tIcSsjO4/mpniPjFVJA244lkvJftDFNKkuT9p8fCU9pjnKu+VM035zA5Xf+A87E6ulV4oJPBi3b5jZ/81U= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(396003)(346002)(376002)(39860400002)(136003)(230922051799003)(1800799012)(451199024)(64100799003)(186009)(82310400011)(46966006)(40470700004)(36840700001)(55016003)(40480700001)(6286002)(1076003)(26005)(426003)(336012)(16526019)(2616005)(40460700003)(82740400003)(36756003)(7636003)(86362001)(356005)(6636002)(47076005)(83380400001)(5660300002)(53546011)(7696005)(6666004)(36860700001)(316002)(70586007)(70206006)(966005)(8936002)(8676002)(54906003)(37006003)(41300700001)(4001150100001)(4326008)(2906002)(478600001)(6862004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:21:03.3237 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 24c77a8b-85b3-49c8-6c46-08dbfa32e115 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EE38.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB7570 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 22.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/13/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=14a722ae6ba37be07b1e71cff6fe7f6d6aa06352 Thanks. Xueming Li --- >From 14a722ae6ba37be07b1e71cff6fe7f6d6aa06352 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 Cc: Xueming Li [ 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 80d2a60473..c6742cb47e 100644 --- a/drivers/net/mlx5/mlx5_trigger.c +++ b/drivers/net/mlx5/mlx5_trigger.c @@ -346,8 +346,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->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); 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); @@ -666,7 +666,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; @@ -700,8 +700,8 @@ mlx5_hairpin_queue_peer_unbind(struct rte_eth_dev *dev, uint16_t cur_queue, dev->data->port_id, 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->hairpin_status = 0; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:26.048409000 +0800 +++ 0091-net-mlx5-fix-hairpin-queue-states.patch 2023-12-11 17:56:23.187652300 +0800 @@ -1 +1 @@ -From ca638c49e402c930bbe20979c7f5aa2bd6bc0a5a Mon Sep 17 00:00:00 2001 +From 14a722ae6ba37be07b1e71cff6fe7f6d6aa06352 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit ca638c49e402c930bbe20979c7f5aa2bd6bc0a5a ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -25 +27 @@ -index 4b5becc10c..35733b0604 100644 +index 80d2a60473..c6742cb47e 100644