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 C6D9242D46 for ; Sun, 25 Jun 2023 08:45:19 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C28A240ED8; Sun, 25 Jun 2023 08:45:19 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2081.outbound.protection.outlook.com [40.107.243.81]) by mails.dpdk.org (Postfix) with ESMTP id AD6B942BFE for ; Sun, 25 Jun 2023 08:45:18 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h5Ns56S5CAE2MHpVb6phkh7l4iuuSG0raXKld2IsWjAa2Gwb4tG7c42i1ag/ho3il2EuislSQhFk6UdZtxvfAVnPEBLwXyhIEQY1dApmomqVLXUdaiGpCDSFWBRQPmu41C3JHve/4mgRZ1jVMLLjS+dL0RDODaWNVzt4ZOtvFBi3r7YhNKviI6AbH++fba8sCh2UVAYOsdKP30ghxghQDHR9suySfbCxXTTbsJTsc+1rNnvGdyZ7kSUkPd3+DXVPd//qxnhL3CPP+MYI1at4/TRLUlR6XdJ4/x3cu2gsaCm1CC09VBaTNyGWXxZCp/+vQkNlYxfnBKyo6oQxhaY/gw== 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=0+XPTmVz23P924UOAI9aBwK9DwV51rcQAVUKFPqzOe8=; b=X+dvSWnQ6Q7x47dq5mjv3xCQLXcZlmAEIHXoyejjGGfLcJd2/5F7lZlJM1W0r8gm0rY+5Em0+5eIqxN96KfV8l8SCWR2J2eveBTAHVNByxY2Ofxfr8jpKN0u2VGnB94eJeU4WlvyCHfgP/Cjd9+Gh+i95smPEMtJWgODnCLjKGRzvf8ec2yljckj9jCL7xfJLKFYgMheAXmveCXshfveWxBzFQEeP5tMa40zWxxT399rf658TaJZMeRjDam/KFZqYaV3pLoyauOMQRAweUjP0UX79rPrZ8UTsN/VyggVLJkIBNj4Knwx2yfeDvv6dpfRxMwh5PFHvJvmwonywae1XQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.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=0+XPTmVz23P924UOAI9aBwK9DwV51rcQAVUKFPqzOe8=; b=RvJCBbP6jv/M6csNO4LGj1VVM3F5R1vP7zL10eot0jHq41420KlNeMYD3lfdibMyqOEpL2j67y1mieCVT7dCHDSStvgDp7I5GbEYBR1RStcbPjHY7f+O9RTQeW06yombwUPWWVlJ6HhnVFduEYUxjnLzeEZKBVgJxVgHyHV+r+e1Ukjp7GRtChRSO+Cam0p8r/13x83XLEiegCmzlxu+D2KHRyZ7nY7mVQ4GloSei3WdBSC2NyK7cIrTed7L2UZg+38BiQslflSFoHNtUnGH6Xv9YcAUOLo8hmKMpGrTvQBE30rw36YWuCaHtF00w2IFq5dmP8m+wd/0z6ITyVwyvQ== Received: from MW4PR02CA0013.namprd02.prod.outlook.com (2603:10b6:303:16d::13) by DM6PR12MB4545.namprd12.prod.outlook.com (2603:10b6:5:2a3::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.26; Sun, 25 Jun 2023 06:45:15 +0000 Received: from CO1NAM11FT013.eop-nam11.prod.protection.outlook.com (2603:10b6:303:16d:cafe::8c) by MW4PR02CA0013.outlook.office365.com (2603:10b6:303:16d::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.32 via Frontend Transport; Sun, 25 Jun 2023 06:45:15 +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 CO1NAM11FT013.mail.protection.outlook.com (10.13.174.227) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.47 via Frontend Transport; Sun, 25 Jun 2023 06:45:15 +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.5; Sat, 24 Jun 2023 23:45:05 -0700 Received: from nvidia.com (10.126.230.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.37; Sat, 24 Jun 2023 23:45:04 -0700 From: Xueming Li To: Qi Zhang CC: Beilei Xing , dpdk stable Subject: patch 'common/idpf: remove device stop flag' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:35:25 +0800 Message-ID: <20230625063544.11183-108-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230625063544.11183-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT013:EE_|DM6PR12MB4545:EE_ X-MS-Office365-Filtering-Correlation-Id: 5677da4b-238e-4851-fd04-08db7547bbb6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wAbXV/YWj+THc8LL0qp+EQs/6lLSc9Km3NRA8sQob84pFtV7GkYSPmxYQooDy0ehEd5KXA1niOOiCFCVF2MLORuj0VO24YF3/er6eMwdocJut09uI+ilTrLgcnhEiP2bx6EQ/dCH15dU1DraQl3x0jv6Q+kqyM2+CB0QqOA8zP1DrpkLmntWqZErT2l8QU1mNwIV4ov4+H0bnWq1bU7CFxmVtXxtPb55M2SHEeWTB0VIk9XmjfvQ+Yk02b4zvilhbNwxW8294tZ8DVSGv75ULvlYTT+jospG/OZk/05/h4MkfVlgpb32UZJI3TnCiTZP+nn0+zVpjKx7N8dUXY/l5hu/OxSVKAEMCxr47tdnbZ7OTn0tYpJz3+WVYA/HJsxCmfXu6BGm8P6LO8AykKIlkwfHrs0WkllPmCPr2XkHalgoigzRE1quZOxM2XgdksLtUzE16ikFofylEqIRtpTGyiqMFi72shaT2IRq0AbVurBGTHUBX1AV6+q0QEZJa5phChz6CWERXa4JLIlTz8ty5j918HSlu8Oyb3pLnWpGUxIWWt9LiBrQRvEanJEz/sxAdwWM2jhDw0hTRDU9Yap5NSAxzvf5OEVCg2rnqkLkTO5NxybRyjxV/yMTOFPz1ANECdWB22dy1RvqaBGAi2NUv1YtTHOT7KNEW9sGh+Be4HQwMqYjojODPYp29pmbP2qF1qQFvMqJA5YGHehDcID0waZzUoJP7gGMwCxHsBeMTKaxYJHHkWK7UamLChVVnrAzH7qVxkJHFlm/MRKMMXimlA== 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:(13230028)(4636009)(396003)(136003)(346002)(376002)(39860400002)(451199021)(36840700001)(40470700004)(46966006)(40460700003)(2906002)(7696005)(82310400005)(82740400003)(6666004)(356005)(2616005)(83380400001)(7636003)(336012)(426003)(1076003)(26005)(6286002)(16526019)(53546011)(186003)(47076005)(966005)(36860700001)(55016003)(41300700001)(40480700001)(86362001)(54906003)(478600001)(316002)(70586007)(70206006)(6916009)(4326008)(36756003)(5660300002)(8936002)(8676002)(66899021); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:45:15.4579 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5677da4b-238e-4851-fd04-08db7547bbb6 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: CO1NAM11FT013.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4545 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/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=1bfcca5b651551437b869401b7c9a5a53588ab0b Thanks. Xueming Li --- >From 1bfcca5b651551437b869401b7c9a5a53588ab0b Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Thu, 20 Apr 2023 11:57:24 -0400 Subject: [PATCH] common/idpf: remove device stop flag Cc: Xueming Li [ upstream commit cf0a881e0b8513ed4c1ee83d9e32680d3403a455 ] Remove device stop flag, as we already have dev->data-dev_started. This also fixed the issue when close port directly without start it first, some error message will be reported in dev_stop. Fixes: 14aa6ed8f2ec ("net/idpf: support device start and stop") Fixes: 1082a773a86b ("common/idpf: add vport structure") Signed-off-by: Qi Zhang Acked-by: Beilei Xing --- drivers/net/idpf/idpf_ethdev.c | 6 +----- drivers/net/idpf/idpf_ethdev.h | 2 -- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/net/idpf/idpf_ethdev.c b/drivers/net/idpf/idpf_ethdev.c index 67d2d49490..b31cb47e90 100644 --- a/drivers/net/idpf/idpf_ethdev.c +++ b/drivers/net/idpf/idpf_ethdev.c @@ -563,8 +563,6 @@ idpf_dev_start(struct rte_eth_dev *dev) uint16_t req_vecs_num; int ret; - vport->stopped = 0; - if (dev->data->mtu > vport->max_mtu) { PMD_DRV_LOG(ERR, "MTU should be less than %d", vport->max_mtu); ret = -EINVAL; @@ -622,7 +620,7 @@ idpf_dev_stop(struct rte_eth_dev *dev) { struct idpf_vport *vport = dev->data->dev_private; - if (vport->stopped == 1) + if (dev->data->dev_started == 0) return 0; idpf_vc_ena_dis_vport(vport, false); @@ -634,8 +632,6 @@ idpf_dev_stop(struct rte_eth_dev *dev) if (vport->recv_vectors != NULL) idpf_vc_dealloc_vectors(vport); - vport->stopped = 1; - return 0; } diff --git a/drivers/net/idpf/idpf_ethdev.h b/drivers/net/idpf/idpf_ethdev.h index 991677c3bc..5633057a81 100644 --- a/drivers/net/idpf/idpf_ethdev.h +++ b/drivers/net/idpf/idpf_ethdev.h @@ -128,7 +128,6 @@ struct idpf_vport { uint16_t devarg_id; - bool stopped; }; struct idpf_adapter { @@ -164,7 +163,6 @@ struct idpf_adapter { uint32_t max_txq_per_msg; uint32_t ptype_tbl[IDPF_MAX_PKT_TYPE] __rte_cache_min_aligned; - bool rx_vec_allowed; bool tx_vec_allowed; bool rx_use_avx512; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:32:01.364044700 +0800 +++ 0107-common-idpf-remove-device-stop-flag.patch 2023-06-25 14:31:58.555773900 +0800 @@ -1 +1 @@ -From cf0a881e0b8513ed4c1ee83d9e32680d3403a455 Mon Sep 17 00:00:00 2001 +From 1bfcca5b651551437b869401b7c9a5a53588ab0b Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit cf0a881e0b8513ed4c1ee83d9e32680d3403a455 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -17,4 +19,3 @@ - drivers/common/idpf/idpf_common_device.h | 2 -- - drivers/net/cpfl/cpfl_ethdev.c | 6 +----- - drivers/net/idpf/idpf_ethdev.c | 6 +----- - 3 files changed, 2 insertions(+), 12 deletions(-) + drivers/net/idpf/idpf_ethdev.c | 6 +----- + drivers/net/idpf/idpf_ethdev.h | 2 -- + 2 files changed, 1 insertion(+), 7 deletions(-) @@ -22,20 +23,7 @@ -diff --git a/drivers/common/idpf/idpf_common_device.h b/drivers/common/idpf/idpf_common_device.h -index 22bbc16b0c..3116a8e44e 100644 ---- a/drivers/common/idpf/idpf_common_device.h -+++ b/drivers/common/idpf/idpf_common_device.h -@@ -112,8 +112,6 @@ struct idpf_vport { - - uint16_t devarg_id; - -- bool stopped; -- - bool rx_vec_allowed; - bool tx_vec_allowed; - bool rx_use_avx512; -diff --git a/drivers/net/cpfl/cpfl_ethdev.c b/drivers/net/cpfl/cpfl_ethdev.c -index ede730fd50..f1d4425ce2 100644 ---- a/drivers/net/cpfl/cpfl_ethdev.c -+++ b/drivers/net/cpfl/cpfl_ethdev.c -@@ -798,8 +798,6 @@ cpfl_dev_start(struct rte_eth_dev *dev) - if (cpfl_dev_stats_reset(dev)) - PMD_DRV_LOG(ERR, "Failed to reset stats"); +diff --git a/drivers/net/idpf/idpf_ethdev.c b/drivers/net/idpf/idpf_ethdev.c +index 67d2d49490..b31cb47e90 100644 +--- a/drivers/net/idpf/idpf_ethdev.c ++++ b/drivers/net/idpf/idpf_ethdev.c +@@ -563,8 +563,6 @@ idpf_dev_start(struct rte_eth_dev *dev) + uint16_t req_vecs_num; + int ret; @@ -45,4 +33,4 @@ - return 0; - - err_vport: -@@ -817,7 +815,7 @@ cpfl_dev_stop(struct rte_eth_dev *dev) + if (dev->data->mtu > vport->max_mtu) { + PMD_DRV_LOG(ERR, "MTU should be less than %d", vport->max_mtu); + ret = -EINVAL; +@@ -622,7 +620,7 @@ idpf_dev_stop(struct rte_eth_dev *dev) @@ -56,4 +44,4 @@ - idpf_vc_vport_ena_dis(vport, false); -@@ -828,8 +826,6 @@ cpfl_dev_stop(struct rte_eth_dev *dev) - - idpf_vc_vectors_dealloc(vport); + idpf_vc_ena_dis_vport(vport, false); +@@ -634,8 +632,6 @@ idpf_dev_stop(struct rte_eth_dev *dev) + if (vport->recv_vectors != NULL) + idpf_vc_dealloc_vectors(vport); @@ -66,7 +54,5 @@ -diff --git a/drivers/net/idpf/idpf_ethdev.c b/drivers/net/idpf/idpf_ethdev.c -index c1782c5fd3..a9d3b6905a 100644 ---- a/drivers/net/idpf/idpf_ethdev.c -+++ b/drivers/net/idpf/idpf_ethdev.c -@@ -792,8 +792,6 @@ idpf_dev_start(struct rte_eth_dev *dev) - if (idpf_dev_stats_reset(dev)) - PMD_DRV_LOG(ERR, "Failed to reset stats"); +diff --git a/drivers/net/idpf/idpf_ethdev.h b/drivers/net/idpf/idpf_ethdev.h +index 991677c3bc..5633057a81 100644 +--- a/drivers/net/idpf/idpf_ethdev.h ++++ b/drivers/net/idpf/idpf_ethdev.h +@@ -128,7 +128,6 @@ struct idpf_vport { @@ -74,12 +60 @@ -- vport->stopped = 0; -- - return 0; - - err_vport: -@@ -811,7 +809,7 @@ idpf_dev_stop(struct rte_eth_dev *dev) - { - struct idpf_vport *vport = dev->data->dev_private; - -- if (vport->stopped == 1) -+ if (dev->data->dev_started == 0) - return 0; + uint16_t devarg_id; @@ -87,2 +62,2 @@ - idpf_vc_vport_ena_dis(vport, false); -@@ -822,8 +820,6 @@ idpf_dev_stop(struct rte_eth_dev *dev) +- bool stopped; + }; @@ -90 +65,3 @@ - idpf_vc_vectors_dealloc(vport); + struct idpf_adapter { +@@ -164,7 +163,6 @@ struct idpf_adapter { + uint32_t max_txq_per_msg; @@ -92 +69 @@ -- vport->stopped = 1; + uint32_t ptype_tbl[IDPF_MAX_PKT_TYPE] __rte_cache_min_aligned; @@ -94,3 +71,3 @@ - return 0; - } - + bool rx_vec_allowed; + bool tx_vec_allowed; + bool rx_use_avx512;