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 8F0E1431D5 for ; Sun, 22 Oct 2023 16:33:50 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 84A1241143; Sun, 22 Oct 2023 16:33:50 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2068.outbound.protection.outlook.com [40.107.93.68]) by mails.dpdk.org (Postfix) with ESMTP id 4E49740A89 for ; Sun, 22 Oct 2023 16:33:49 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Zshp6PqTrONa7r52oqJLbz0y276WlKtr2zZklauNDGz8X84xLVEP/h3hLlXyhZuUSJQl7NLqFIOBq07F5NrSnYbzi64dLc1HrncJO33od/6dRJJDgyiXuyHBuUnHzIqUCvh6L1sJtuMTtYznJqDwaPH9jOshIBwHt9upiZeE2sdeeCpp2+HRT/xSzj0a+HP6tc09LFCXVKn7RtLVMeAuJRClE+KsTfzYV0cypdxXu1qRu1j3gQVBRGiEYvw9olBEYs/LkZRgnqv/+RqfvLpKJ+AJ2auCMVXRtHJ+OEIt41ymAE15WYkmmJrBdvJTH2TwPlvWnh+64UXAcLhO7C30/g== 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=tqEv7AGuf/6wM9XiRdZfO6OoCuraVXGUuoS2/CKpizE=; b=frAX9YcgKxqM6WSitk8/3AHNtR0jEkUu1g1644pPPZScxxzF/JW77TYQbI0vlzAngb2WHGw6s6DHp6JOep3Vp2qiQ328B4syToY1CG/UIQjFPJAKSzWPplpEhvtvIw6Audjt5TJR/ntyAc/aUACa8bI8Um7OwGFUAVdjMz1v9R2bcMRfSeuR61yaMHBnowhR8qYb26blesfgdhb8LSDPl37D1t5PRZZkKFuQ9zqr0DdJKj+d9Di4zjiJ1xggiUqn2FhBECRrIjn7FO5RpUyYHxlJkf+Zc8zp1qsN0R1JDrWtU29qjxBjuiJ6I80Y10x+7/2AF6MLcIHk9CJD+bCBfA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=huawei.com 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 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=tqEv7AGuf/6wM9XiRdZfO6OoCuraVXGUuoS2/CKpizE=; b=YjmwPrgtkAcDBVu1cGDYntsLNcyP+XZ02HSOB3h/iYjZLLFL2dvXLyVgagSgXzoNfR7COJEhDu0y6Qo1K4OPuSEJABZfOUKjA0BAbTNwWmphIXrtGSr9UxwLZ2/ac8gHZ4lff0gDktBQUgUs4/RlY392VjAfTPt0jIkxnsaCJJn2aCbxa2ZH7ux27CApCYGmWQvx3k10/snmSJ5ClLbvTORstYzBMfTg1fBFNbddkJLOC4NnQbyiO6Ku9CSgyQz/rXsVH/jJBICdU1Px2OP27exWGAHSDHBIb/VaHPASHxHRNOtNcq+b4+2aDIvdvRvCUkgrl9REUGGhgG3edU6iQg== Received: from MN2PR13CA0021.namprd13.prod.outlook.com (2603:10b6:208:160::34) by CY5PR12MB6405.namprd12.prod.outlook.com (2603:10b6:930:3e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.31; Sun, 22 Oct 2023 14:33:47 +0000 Received: from BL02EPF0001A0FB.namprd03.prod.outlook.com (2603:10b6:208:160:cafe::e6) by MN2PR13CA0021.outlook.office365.com (2603:10b6:208:160::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.16 via Frontend Transport; Sun, 22 Oct 2023 14:33:46 +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 BL02EPF0001A0FB.mail.protection.outlook.com (10.167.242.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 22 Oct 2023 14:33:45 +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; Sun, 22 Oct 2023 07:33:35 -0700 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; Sun, 22 Oct 2023 07:33:34 -0700 From: Xueming Li To: Jie Hai CC: Ferruh Yigit , dpdk stable Subject: patch 'net/mlx4: fix Rx and Tx queue state' has been queued to stable release 22.11.4 Date: Sun, 22 Oct 2023 22:22:31 +0800 Message-ID: <20231022142250.10324-123-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231022142250.10324-1-xuemingl@nvidia.com> References: <20231022142250.10324-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: BL02EPF0001A0FB:EE_|CY5PR12MB6405:EE_ X-MS-Office365-Filtering-Correlation-Id: 02ca79da-dd42-4279-f225-08dbd30be5d5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DH4UB+sZ/dVyz7OixE2ezrHz2Rnz5eg2AvFLti8hkv4MM5A4rxqhcVb1fhjzPepgfyNoxfbNwg0PSHYFUhWMsY0gcFUiq8fDfT95dUWQwrLyWHJGJmvJKmdvay2VbonJ7bg/EbdKT7/uEoeAVBmzizhv4EWkeo4n0I/bJ6lDKdVAxe15Yy4pQZJok1QgxMvG1ADxSob2mJ9blh+oZ4Zuxd5X0POFfh7Ajjw2CxFJx1U+VPk84DEUCZkUYCjVOulglXP9NPXPH+L0NPSAZ2OCN3XPmYLZJvaxw+gapg4d8qe1RHl5XsUByOBln2eDLOta62DLJGyI5cva5XjjhJpTKHa0NjDDtaBaj10Lfx3JZovvjuTZKhUbOA4Hh9//BL2TKHaCaYCe+eqpdsf++PDAqniUNQFk0MQPMr1wqcNSehMXLpd96l7xs8xQ9klypBFwIb0sFMgyBodxhMuVT5IKToU6mxTPsc6VXnum/cy26gTslFoSXUwnaz4dwNd6T+xX2w8AZXXWsSqVePODMFJM4mBONXTRwqkV1NEYza9tX7vEaMf+fGW5OorBRX7rVTBX2FJhZzDM5Mg0id9Xf2F907JPUDXTjMb0iwLJm1pf2Uo6AGc3Gg8FsTVOOMdKWFWTkbWD0WI71N9aH4K/RFw2TmobaQhEYBeVzczEPIPxxz+QVGgV3KAUk4FuWGc75JWXwqIkeHpUIr0t0VU/o879NQaioXdnwVU0C89gEm0PepJwLJJpOF/4w56QOQbSN8uyDZl1M/jpQzqwGl7X5LD/CMcsyBsFZrhoVJUyhhP7INI= 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)(39860400002)(376002)(136003)(346002)(396003)(230922051799003)(186009)(82310400011)(451199024)(1800799009)(64100799003)(46966006)(36840700001)(40470700004)(4001150100001)(6286002)(2906002)(55016003)(36860700001)(41300700001)(40460700003)(86362001)(5660300002)(36756003)(4326008)(8676002)(8936002)(2616005)(356005)(19627235002)(478600001)(6666004)(7696005)(16526019)(26005)(7636003)(1076003)(54906003)(82740400003)(316002)(70206006)(70586007)(6916009)(966005)(40480700001)(53546011)(426003)(336012)(47076005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:33:45.4974 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 02ca79da-dd42-4279-f225-08dbd30be5d5 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: BL02EPF0001A0FB.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6405 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 11/15/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=accdf4594bfb0b887ad2a0f5cc9ee54b10a91583 Thanks. Xueming Li --- >From accdf4594bfb0b887ad2a0f5cc9ee54b10a91583 Mon Sep 17 00:00:00 2001 From: Jie Hai Date: Fri, 8 Sep 2023 19:28:44 +0800 Subject: [PATCH] net/mlx4: fix Rx and Tx queue state Cc: Xueming Li [ upstream commit 7cc3ea8934785226c6fe6d403ea5b31761d5f52f ] The DPDK framework reports the queue state, which is stored in dev->data->tx_queue_state and dev->data->rx_queue_state. The state is maintained by the driver. Users may determine whether a queue participates in packet forwarding based on the state. Therefore, the driver needs to modify the queue state in time according to the actual situation. Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information") Signed-off-by: Jie Hai Acked-by: Ferruh Yigit --- drivers/net/mlx4/mlx4.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index a54016f4a2..1389b606cc 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -292,6 +292,7 @@ mlx4_dev_start(struct rte_eth_dev *dev) { struct mlx4_priv *priv = dev->data->dev_private; struct rte_flow_error error; + uint16_t i; int ret; if (priv->started) @@ -327,6 +328,12 @@ mlx4_dev_start(struct rte_eth_dev *dev) dev->rx_pkt_burst = mlx4_rx_burst; /* Enable datapath on secondary process. */ mlx4_mp_req_start_rxtx(dev); + + for (i = 0; i < dev->data->nb_rx_queues; i++) + dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; + for (i = 0; i < dev->data->nb_tx_queues; i++) + dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; + return 0; err: mlx4_dev_stop(dev); @@ -345,6 +352,7 @@ static int mlx4_dev_stop(struct rte_eth_dev *dev) { struct mlx4_priv *priv = dev->data->dev_private; + uint16_t i; if (!priv->started) return 0; @@ -359,6 +367,11 @@ mlx4_dev_stop(struct rte_eth_dev *dev) mlx4_rxq_intr_disable(priv); mlx4_rss_deinit(priv); + for (i = 0; i < dev->data->nb_rx_queues; i++) + dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; + for (i = 0; i < dev->data->nb_tx_queues; i++) + dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; + return 0; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-22 22:17:38.740910300 +0800 +++ 0122-net-mlx4-fix-Rx-and-Tx-queue-state.patch 2023-10-22 22:17:34.406723700 +0800 @@ -1 +1 @@ -From 7cc3ea8934785226c6fe6d403ea5b31761d5f52f Mon Sep 17 00:00:00 2001 +From accdf4594bfb0b887ad2a0f5cc9ee54b10a91583 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 7cc3ea8934785226c6fe6d403ea5b31761d5f52f ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org