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 0B7F0431D5 for ; Sun, 22 Oct 2023 16:33:17 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 05055402EA; Sun, 22 Oct 2023 16:33:17 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2088.outbound.protection.outlook.com [40.107.244.88]) by mails.dpdk.org (Postfix) with ESMTP id 01515402DA for ; Sun, 22 Oct 2023 16:33:16 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nH9ItKQ4KWAxJiolaUKSqiyjiECQLlnlbyPsSiCS5Kdp5w4XMb+/0zWod5Oy9YF/7me0iuHmbldhNQ/SM+dQFUKDSLqZhWyv5H/aXL1TwU6prMgFsMRd1QFxu+kYVFsj3GoU+cahfEJ5vy/aE3kdeDjNCVCKcFO39iBYJdmDiFpBDxizKiraAdvV/JaNacph0Kj16tEg0MXQ+9FPAND9GJh5/rK/qb8a4+W6sIUkqF4nXbd5EJ3D1BHRs6upHF9KvxGRusl2eXtmNrLMCjfJ8mJfxDXDrMTJHqSJKKyihOYAd+ZwZzpxeAKGFQIWAQWoN3ZhjRaGjRr6fapN1s7Acw== 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=CcBhM6Vf+CHWFJesWLEHKszXWF9CnDxdLxk+6zHsMX4=; b=jVu+eVp9YYyuAZb1udZYLsRQ4Rb4aKO4MuzZPp645ezh7z3yasH7JiMJeiKY1t+9H9nsPRA34cubY1joleb9VrwFmelHNR2fSgF+hiT/09bblbowQq2xPPaXxwifT7VnIngVnDb/AQxFsRcRmOUJXXS5Cv2vr0+9Br6MEhunfgCXYI4tUcmtcoFbATXLhJZR3y4SxrEARXo9dqQAfVpl3vyQQOl3a1EwoJ6YnmEgjSoAIctTDR/+aR2uZ2HneIewcZ8fsU0Tw4AeU3Rv87FRaq5AA0VbPd/vcYPLCWSZohlpTEN5pP764v+LlD2bb0OYOYnXQkvUCZ+VNDic0ONbIg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=CcBhM6Vf+CHWFJesWLEHKszXWF9CnDxdLxk+6zHsMX4=; b=J1e89JXHpnKvIirX47IyefKyFZvoQCn2mmPtApJB0CTnFnxFWpZGraPLk3A4FpwOAvPUO1r8yp6TxuK7PP7vZtMEEpmL89SmI7aDK6++rBy9ay68MYpbLjiSjvgsHsFnPwRf/d8XohOEvTTlX+YBdQBgIut6X99a7HvFTPGY8H78AktKXbwjGRUxJtjP7MZUCdHYSg4ibaz+HESCdsHdxywX6n8STjreB6fucFNuV45MUqa/Wp1j7N1DF8IVpL9w+QwghIspU6cctrf8mxeHsyCCN6Cr609Eh38nKqwrhqb8QgRuz7wSd8ZSRrM+9Rioh/eERw5QLxckbLeCgIbg4Q== Received: from CY5PR22CA0094.namprd22.prod.outlook.com (2603:10b6:930:65::14) by DS0PR12MB6584.namprd12.prod.outlook.com (2603:10b6:8:d0::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26; Sun, 22 Oct 2023 14:33:13 +0000 Received: from CY4PEPF0000EE37.namprd05.prod.outlook.com (2603:10b6:930:65:cafe::ab) by CY5PR22CA0094.outlook.office365.com (2603:10b6:930:65::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33 via Frontend Transport; Sun, 22 Oct 2023 14:33:13 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CY4PEPF0000EE37.mail.protection.outlook.com (10.167.242.43) 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:13 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) 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:06 -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:05 -0700 From: Xueming Li To: Jie Hai CC: Ferruh Yigit , dpdk stable Subject: patch 'net/e1000: fix Rx and Tx queue state' has been queued to stable release 22.11.4 Date: Sun, 22 Oct 2023 22:22:24 +0800 Message-ID: <20231022142250.10324-116-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: CY4PEPF0000EE37:EE_|DS0PR12MB6584:EE_ X-MS-Office365-Filtering-Correlation-Id: cc9085a0-8b36-4ed3-8a9a-08dbd30bd2d8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sfMoNRuaWwTil0hOd7ivDJV97s0OuoQ5XveMbu/Zmw3vTcaLrG0RQi8YrqvHsPbBa6OUpUIluh15K5gsyaQOszjINHLxIiIRlaEHnhb4p6/UDYBxPPwXRgzYQ6vkfoGPFZ04k1aGJuO7Tw7F6ib9FwE7pOZhR6N5mS7TN2QH4dMQw2gVCmP4XY1Xvs1Ah5AOGROBL1+n1b7fLHw+Wt2sIR0zaFkMkdGmCVeeacenKN4w+dhkoOCbCHBMvU5x023Nb+2+sAHFBl/JeesjCbBNqckHaeqzH79cRPvNVVYbsUGVEzLwkp5x49QtX/JAoMZEjuWqGTHcIqZhc8qUzucQiQZLz3oLjOmd0i6o+5Qms8gM3bWdWyTSRflRzyiR/3Z6u62zhN5LSJ+sAqgqIieasWkQ0tjZZWKQLzww1YkXCEzowdVxxVlwQh4RgkqS9E1Emj0U/lajxQdhGh+cGRzXdxYEB4ljXHliVHzubfj89afnWOWp0Qxyr3HNLnKAfEr/xvQTWQUGtSf0NfaPsRRjA2OboIXf1PZXxUR7RRQQlTXSMe+V+3WlGHShFwpDjokv15dYgqe1eKyPUG1UWZ3BpZUka7coXLdwHs3dytERO6jNsxF4i0Hb+cA+ibU3uOJNhFlVJFh4heyUlwFWQC5WcPjIYtjE3daswQMsOH+Dx6babhr58hk814DoIzf2dZ028UjAHrmZwJhcri57mwpXrtkneQVkqaoTmIcN+tn/ZU+5BKMbn7Lt7axx9Ss07S5GDc8SfsCl3bgSV1w9OPz1uf0BZdLxRDH9SGp9lYYz2I4= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(136003)(39860400002)(376002)(396003)(346002)(230922051799003)(64100799003)(82310400011)(186009)(1800799009)(451199024)(36840700001)(40470700004)(46966006)(55016003)(40460700003)(36860700001)(336012)(426003)(5660300002)(8936002)(4326008)(41300700001)(8676002)(83380400001)(2906002)(6286002)(26005)(47076005)(2616005)(7696005)(16526019)(53546011)(6666004)(1076003)(40480700001)(86362001)(36756003)(4001150100001)(19627235002)(54906003)(70206006)(70586007)(966005)(7636003)(356005)(6916009)(316002)(478600001)(82740400003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:33:13.7158 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cc9085a0-8b36-4ed3-8a9a-08dbd30bd2d8 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EE37.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB6584 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=36e418d7890336cccf43e6520e78df5ea1b62b08 Thanks. Xueming Li --- >From 36e418d7890336cccf43e6520e78df5ea1b62b08 Mon Sep 17 00:00:00 2001 From: Jie Hai Date: Fri, 8 Sep 2023 19:28:36 +0800 Subject: [PATCH] net/e1000: fix Rx and Tx queue state Cc: Xueming Li [ upstream commit f679a8d646b62138cf02f173ad80885ca9881f9f ] 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/e1000/em_rxtx.c | 8 ++++++++ drivers/net/e1000/igb_rxtx.c | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c index cb5ce2307b..df5fbb7823 100644 --- a/drivers/net/e1000/em_rxtx.c +++ b/drivers/net/e1000/em_rxtx.c @@ -1576,6 +1576,8 @@ em_dev_clear_queues(struct rte_eth_dev *dev) em_tx_queue_release_mbufs(txq); em_reset_tx_queue(txq); } + + dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; } for (i = 0; i < dev->data->nb_rx_queues; i++) { @@ -1584,6 +1586,8 @@ em_dev_clear_queues(struct rte_eth_dev *dev) em_rx_queue_release_mbufs(rxq); em_reset_rx_queue(rxq); } + + dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; } } @@ -1812,6 +1816,8 @@ eth_em_rx_init(struct rte_eth_dev *dev) rxdctl |= E1000_RXDCTL_GRAN; E1000_WRITE_REG(hw, E1000_RXDCTL(i), rxdctl); + dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; + /* * Due to EM devices not having any sort of hardware * limit for packet length, jumbo frame of any size @@ -1946,6 +1952,8 @@ eth_em_tx_init(struct rte_eth_dev *dev) txdctl |= (txq->wthresh & 0x3F) << 16; txdctl |= E1000_TXDCTL_GRAN; E1000_WRITE_REG(hw, E1000_TXDCTL(i), txdctl); + + dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; } /* Program the Transmit Control Register. */ diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c index 1d23e081b6..6027cfbfb1 100644 --- a/drivers/net/e1000/igb_rxtx.c +++ b/drivers/net/e1000/igb_rxtx.c @@ -2744,6 +2744,8 @@ eth_igbvf_rx_init(struct rte_eth_dev *dev) else rxdctl |= ((rxq->wthresh & 0x1F) << 16); E1000_WRITE_REG(hw, E1000_RXDCTL(i), rxdctl); + + dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; } if (dev->data->dev_conf.rxmode.offloads & RTE_ETH_RX_OFFLOAD_SCATTER) { @@ -2815,6 +2817,8 @@ eth_igbvf_tx_init(struct rte_eth_dev *dev) txdctl |= ((txq->wthresh & 0x1F) << 16); txdctl |= E1000_TXDCTL_QUEUE_ENABLE; E1000_WRITE_REG(hw, E1000_TXDCTL(i), txdctl); + + dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; } } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-22 22:17:38.510306000 +0800 +++ 0115-net-e1000-fix-Rx-and-Tx-queue-state.patch 2023-10-22 22:17:34.396723700 +0800 @@ -1 +1 @@ -From f679a8d646b62138cf02f173ad80885ca9881f9f Mon Sep 17 00:00:00 2001 +From 36e418d7890336cccf43e6520e78df5ea1b62b08 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit f679a8d646b62138cf02f173ad80885ca9881f9f ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -64 +66 @@ -index 61c6394310..448c4b7d9d 100644 +index 1d23e081b6..6027cfbfb1 100644 @@ -67 +69 @@ -@@ -2745,6 +2745,8 @@ eth_igbvf_rx_init(struct rte_eth_dev *dev) +@@ -2744,6 +2744,8 @@ eth_igbvf_rx_init(struct rte_eth_dev *dev) @@ -76 +78 @@ -@@ -2816,6 +2818,8 @@ eth_igbvf_tx_init(struct rte_eth_dev *dev) +@@ -2815,6 +2817,8 @@ eth_igbvf_tx_init(struct rte_eth_dev *dev)