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 08B8A431D5 for ; Sun, 22 Oct 2023 16:35:03 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0302D427E8; Sun, 22 Oct 2023 16:35:03 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2051.outbound.protection.outlook.com [40.107.237.51]) by mails.dpdk.org (Postfix) with ESMTP id 965A94114B for ; Sun, 22 Oct 2023 16:35:01 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DrmCs2NxIlDdETHFnnZ8hMpT9qZv2OYQ2TLiyyPDtvA3a98lEiAp2ojpQQ8Yd/eJUOeNT0HIkPgjY7YQY54uWbpYb2aporY6caENNHtwRZ/KdkPy2nd8HUui1q7V26r7ryE1reGvPscjsRA6SvzqEbGdx/9zw7YFU2egdHHj18MRoXy6ft+sbZ8DsYfRqCRkwE/PQE4y2SGtfGqctwEKNxR/qbcqDn9+XXGVZivxmWQbcqUvWUAR0EIId08CUkGJ+ZLVl9GDaHP7ij8o9D1jSbULv82ADm8RlMuLfG9a8fmmSt7cGZR8NpaA+S+hd/AkMRqDffBPKHe4xxytC5KJLA== 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=6kOokb2vzmuV6+SKLEWHiKwRQrGfvCW1OZOyWw80fSU=; b=es/Do6+q/9jbVrnbok02vAZrXW0O5eMA2q0QnAq2rfvIrkaiHIn/EqeAh0vT64q6C0vmZ6AMmscCz5/pUtWXE+lHOlF2B5as0ENKTVRzM7bIBy21Rq5PwS1HMMJBQ227fHL9p8afIgVku7ErIUBMCm4Q6ZzjpulBenrf08pb5+lMje76vWAJC3t/Js8N1TOAFxJV0nbbnP7WX7ScQb+o3nWy5VzbGOIJd2cLMX69ceoysZGimKUTQT8Y9A2XYHC+NsfkilunHPsKotdA4kzTNQDge5gcGL7IhNNXo66uZd6EQU6jgFkR30CD+eR+szoM7qdtUacMkrC2gHZ1bLCGiQ== 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=6kOokb2vzmuV6+SKLEWHiKwRQrGfvCW1OZOyWw80fSU=; b=eq0zIiRbtHfEBBaVjUBWl6NXzhATjnUaLZD8KE3AcSaukRLSCiLytf3diw1dK7EmaZePNzAzj/0ThW2zQx/bBJqNIkDl+cGYEyDc2lA+LzSiL7QZv9uE3cajY9I8nHPw7Op2Z9Ux36lEDI+lReXg/ixIxP2/66eCP0xcJfXRqhK3pgVx8MdGwGfpRArzMNUB8cPnHTul+azl+BW0YxEGPMDHQkAikoVvVWosCnRbEka5TuJqD86pzer/m4V4Otw6ltQkeFoKMZocedQVxemlQRUHTxjSd7bjTK+i2ckLLwwQFMDwKFOnwzTS0jZjeTUeukW6T3HOTJG6XYydwzVLDQ== Received: from BL1PR13CA0106.namprd13.prod.outlook.com (2603:10b6:208:2b9::21) by IA1PR12MB6140.namprd12.prod.outlook.com (2603:10b6:208:3e8::16) 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:34:59 +0000 Received: from BL02EPF0001A0FC.namprd03.prod.outlook.com (2603:10b6:208:2b9:cafe::c6) by BL1PR13CA0106.outlook.office365.com (2603:10b6:208:2b9::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.14 via Frontend Transport; Sun, 22 Oct 2023 14:34:59 +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 BL02EPF0001A0FC.mail.protection.outlook.com (10.167.242.103) 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:34:59 +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:34:51 -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:34:49 -0700 From: Xueming Li To: Jie Hai CC: Ferruh Yigit , dpdk stable Subject: patch 'net/virtio: fix Rx and Tx queue state' has been queued to stable release 22.11.4 Date: Sun, 22 Oct 2023 22:22:45 +0800 Message-ID: <20231022142250.10324-137-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: BL02EPF0001A0FC:EE_|IA1PR12MB6140:EE_ X-MS-Office365-Filtering-Correlation-Id: 56214042-da86-4a32-f011-08dbd30c11ad X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5mJnh/A52CZYkyHKc/Kas91wnDuJ3VZ07O3fGWqROq9gMhtwJn89zgf5Y0abyQmMkUCicFDbcMiTLoSERJFjEw9N3dIBdLSui+vcosGaNI/FpC/0x2nIL1/+A2S0PbYAnjcRvB/AEJdt4We9cAL7EhyCunEQgqDTk7FWSQd4oMsnsCMT2Re7Y+vBxQhzwFqi+7BhAFRE8hM5DrkWTkIG8ZamHavSXO5aoNO+rabKsU4nYCSG4e8XJw/vQGiP5gLug7N3oiitIXtkYs72k5N0eYpGTNUVKd6TdhThBloMXYPOXnhyXcvQ3J8AFL/g1FkiIjdgEpLjSqn6TnmCpAMiFjKLNqyZi3hYKAsub/xH2sOL9Cnhg45iMQrosvUqA1RxthYfOE/ncCDPN0jvZB8CqOafHUVhNp6EQqhMOENdcxAovjQMyFtCHye1rgnhiRfsINfZp2L0JXY+g0IChOJuBBvfztMEceFw4aq1F0xPmobkd8gmWQ+TjsfmUAHUfHJrXG/q3gXMZ4aJFff3adRoi7v3cvkt9775XCnIpVtaugmIm7bT/xMi3DVAntMtIH7eI/e7/+zGpsKGiPidPuqVyzfQzb0NZo9NT4uazAZgQU9qFysXkkeIzEKc2t7q/9aF/Wix7YjlBIWc1t3FQRINloHR33omtcamx7EdjxSJf7zp8bmBmZ2U6UNSHWIRe/d99W7wNln9gGqwWgi1bsktSsF6UfFY9oJO+d4pe0MA8daW5J6A0BLxbPeVvzRctlMo 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)(376002)(346002)(136003)(396003)(39860400002)(230922051799003)(186009)(64100799003)(1800799009)(82310400011)(451199024)(46966006)(36840700001)(53546011)(70586007)(86362001)(6666004)(7696005)(82740400003)(55016003)(36756003)(356005)(7636003)(83380400001)(70206006)(4001150100001)(19627235002)(966005)(478600001)(2616005)(16526019)(26005)(336012)(426003)(1076003)(6286002)(47076005)(36860700001)(40480700001)(2906002)(8676002)(8936002)(6916009)(5660300002)(41300700001)(54906003)(316002)(4326008); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:34:59.0706 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 56214042-da86-4a32-f011-08dbd30c11ad 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: BL02EPF0001A0FC.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6140 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=bdaff489453dc29f7eedbf021177731fd16bfd70 Thanks. Xueming Li --- >From bdaff489453dc29f7eedbf021177731fd16bfd70 Mon Sep 17 00:00:00 2001 From: Jie Hai Date: Fri, 8 Sep 2023 19:28:59 +0800 Subject: [PATCH] net/virtio: fix Rx and Tx queue state Cc: Xueming Li [ upstream commit 0170be6f4f90fdf3295c23520fc1547c1a2405db ] 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/virtio/virtio_ethdev.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index c4f6fa55b3..11b9a4bc72 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -2855,6 +2855,11 @@ virtio_dev_start(struct rte_eth_dev *dev) set_rxtx_funcs(dev); hw->started = 1; + 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; + /* Initialize Link state */ virtio_dev_link_update(dev, 0); @@ -2944,6 +2949,7 @@ virtio_dev_stop(struct rte_eth_dev *dev) struct virtio_hw *hw = dev->data->dev_private; struct rte_eth_link link; struct rte_eth_intr_conf *intr_conf = &dev->data->dev_conf.intr_conf; + uint16_t i; PMD_INIT_LOG(DEBUG, "stop"); dev->data->dev_started = 0; @@ -2971,6 +2977,11 @@ virtio_dev_stop(struct rte_eth_dev *dev) out_unlock: rte_spinlock_unlock(&hw->state_lock); + 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:39.212360400 +0800 +++ 0136-net-virtio-fix-Rx-and-Tx-queue-state.patch 2023-10-22 22:17:34.426723700 +0800 @@ -1 +1 @@ -From 0170be6f4f90fdf3295c23520fc1547c1a2405db Mon Sep 17 00:00:00 2001 +From bdaff489453dc29f7eedbf021177731fd16bfd70 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 0170be6f4f90fdf3295c23520fc1547c1a2405db ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index 2c23f1c00e..3ab56ef769 100644 +index c4f6fa55b3..11b9a4bc72 100644 @@ -26 +28 @@ -@@ -2417,6 +2417,11 @@ virtio_dev_start(struct rte_eth_dev *dev) +@@ -2855,6 +2855,11 @@ virtio_dev_start(struct rte_eth_dev *dev) @@ -38 +40 @@ -@@ -2506,6 +2511,7 @@ virtio_dev_stop(struct rte_eth_dev *dev) +@@ -2944,6 +2949,7 @@ virtio_dev_stop(struct rte_eth_dev *dev) @@ -46 +48 @@ -@@ -2533,6 +2539,11 @@ virtio_dev_stop(struct rte_eth_dev *dev) +@@ -2971,6 +2977,11 @@ virtio_dev_stop(struct rte_eth_dev *dev)