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 9979345A68; Fri, 11 Oct 2024 11:34:36 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CCC534042C; Fri, 11 Oct 2024 11:34:33 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2042.outbound.protection.outlook.com [40.107.220.42]) by mails.dpdk.org (Postfix) with ESMTP id 0BB49402E3 for ; Fri, 11 Oct 2024 11:34:32 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gwL6TUzHNOQvGKenlw9r38fdy5WrQk14l3D1KiWRRucwPT0E7RvvDj3duCCfAUSFmn5FMblXsBGxv+4m+MuJonF6nj8fV9d9Q+z047iKckku10tGaEmZ7liMMyJSxyc/XN0FbxzImEA6Xisu4bO6mPQ9ajDHYGs+wb0GQMrhY7RuDECKNMfcBMoVpdXl8dVf42eBvsD3XiXGxy5fzncdl8+v2lvimRAnbFbwQ0R27ZX/VRAauCgtQ8XFETJFPpVL6Rv015LyfuiHRjuzz3UfG2EJxax9TeRd89SDudnXdD3CfOExLMokywGo7B3G0pQQO5I567HVi0wps3scdQF9oQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=v18FVZTy19GHT+uXJYb74hcJ7B2/68aGGBO3VmbBLNw=; b=EoLZyWRfO/tjGHQlRFjo+5TCU7p2qUsVbcBjP8qLLc0S+fJ9hFuoiK40Rcmh4PV20sI5AzGkisF3v5YuUxyaUahQL2u4Yzl+Ztynu2+cuUwf+dIQi7qsTZt29/8Pjj4IwPWo1WN3yiMIqd9k2iK6jq94+rZZHne0+Q8QIbYiW6iYs3rmklk6fRIo9/hGnkjRMQUs1iywbUAYbCRyFwlk3NyWVM8p55NID9yRGmun/oevF9F+uSnOM2ut3arDrsb3qrNyyduLwnaoLft6Hdfyd7GUR9E+GIcZhzkCkT3VwEn2p9CXRBPLgX6wNhil1CsLQHHraq294SGBOhYa02/Axw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=monjalon.net 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=v18FVZTy19GHT+uXJYb74hcJ7B2/68aGGBO3VmbBLNw=; b=hcwAQTB13OIxrkd81I6ZcJnyHgJCX5Jtpgq7ijRWu5cb1JOMeAhE+F7yu2Yt+yi/uAte1Oe/CPge88Dy8YLo30/+ygxNsllCS5HVwy4iuwwGYmRI13XBi6VcBS2JwymHRVXkpA7UJsE4yoLVX1PTz2UcORXAb3p/fchAE0IhjETCXfoV4q5xwnlQg3QlK8TR7nYgOjVjKVSjNRV2at1Fw0LCfToOMLA8OTqTleMs7QPCqW2z3US80N+nlqShTBE/3k99erw4qkYkQafBeRCwh4XJtaMDHnd16n8SJB4pKp9XphNm7hX7ACi5jckp4cgWGCuobEzyAWbSmiUIEpBKHQ== Received: from SJ0PR13CA0061.namprd13.prod.outlook.com (2603:10b6:a03:2c4::6) by CYYPR12MB8990.namprd12.prod.outlook.com (2603:10b6:930:ba::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8026.22; Fri, 11 Oct 2024 09:34:28 +0000 Received: from SJ5PEPF000001D4.namprd05.prod.outlook.com (2603:10b6:a03:2c4:cafe::c1) by SJ0PR13CA0061.outlook.office365.com (2603:10b6:a03:2c4::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.7 via Frontend Transport; Fri, 11 Oct 2024 09:34:28 +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 SJ5PEPF000001D4.mail.protection.outlook.com (10.167.242.56) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.13 via Frontend Transport; Fri, 11 Oct 2024 09:34:28 +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.1544.4; Fri, 11 Oct 2024 02:34:21 -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.1544.4; Fri, 11 Oct 2024 02:34:19 -0700 From: Dariusz Sosnowski To: Thomas Monjalon , Ferruh Yigit , Andrew Rybchenko CC: , Konstantin Ananyev Subject: [PATCH v2 1/4] ethdev: rework config restore Date: Fri, 11 Oct 2024 11:33:48 +0200 Message-ID: <20241011093351.187191-2-dsosnowski@nvidia.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241011093351.187191-1-dsosnowski@nvidia.com> References: <20241011092103.181145-1-dsosnowski@nvidia.com> <20241011093351.187191-1-dsosnowski@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: SJ5PEPF000001D4:EE_|CYYPR12MB8990:EE_ X-MS-Office365-Filtering-Correlation-Id: 5dc6873c-8985-40e0-7849-08dce9d7e72b X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|1800799024|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?gKQSCZlW0ACZvkDOmZDfTOgcUI8RSLQldB/OjTikUAcYLZbz5VFb4sVJQ0qZ?= =?us-ascii?Q?HRETQkKU1YU71MPnwyhjjN66rQ0dEvjykhB2OuXlOH/qek54hOxEz/eUAjnC?= =?us-ascii?Q?KpS3gGeLte/qYd2g67lhPc/DBO7uBGqCMMXJzev0bRgfhQBFc54Jq3rzErDv?= =?us-ascii?Q?3IQPx9Dyi7VaNOxEdNxkbxMx1oJliAiKnSGlSfVCCY6YiCSWvKj4XPMfNWTg?= =?us-ascii?Q?jF6YWJ+LAx5w8jUPwD5zy58sLxYcU0Hhz4JFwbjaMOXEXvRHUBv1xhbqszBy?= =?us-ascii?Q?0Y8Ji3C1dmHR3+Ps5Vi7hhaotMIxaHaKkR9F3umMjQzuwkPshLv7JU8FysDL?= =?us-ascii?Q?LPMxWfaVbB9ah36fUsFaIidpD5UOuDhSJ/1fZUO+SDKcNn0zMO2LbZQ7M4Gq?= =?us-ascii?Q?L68axKl6Oc24NU7TABEUHc4YrpfTscWwBT1GRe3Od2RRnsMTLaioiU7CyWZR?= =?us-ascii?Q?z1JS/yLlplgbV5DnpHLzXInpzoA4/ht+4yKpX+lJgZMs6V1ffkvSiUOz76sZ?= =?us-ascii?Q?m3QVoARumK58f4Ev4gHunKg6xxcVHbchSo5vpjF4lxK8R/PGN7qsjmQsHMcS?= =?us-ascii?Q?yqXw8cxJ/5WbKVnYcHA70jH0D7RZL6RLkY+cIyBE3uWQlGGjV8c4BZksmjGy?= =?us-ascii?Q?/nMfwN5Z1deCbpl+C/240IeRy7gTxOenkb19FJR1WliMILbMy7Bx1erRzd2w?= =?us-ascii?Q?XSB1oxXS5wd8rQfFtsjYEAvYkGzajy22Y/TUeXunANfjOnSdmVEiuB6hbufI?= =?us-ascii?Q?gbyNIU+3TFhFsvuv4qVQTy4KcwKGHSjNXUNw2AmUqeVYWHkVfEuLwFgjfa15?= =?us-ascii?Q?X5YPHgfUpsYtKk4C5IXHJnp3wDitftBm34dvzJxAinnfcvQ3ZRUGaNnQ8r8m?= =?us-ascii?Q?tsf8413aJswQampHnx9hRoRtX0+AxHDx5j9H8xN0Z0AD7a3i/KqK5wgQc9SE?= =?us-ascii?Q?wpoDlDsLbIFSGKsgkwL2gwMneOVK6tv/BmuZp6HCfDViMmF0sZBZ70csmuYu?= =?us-ascii?Q?KRzuZdu5GMTL0ZgnVBa++ZtXlxnx3+FCtG8YItsj1dmD4+eOrH3QmqVhLBun?= =?us-ascii?Q?VLGMd7wkmSfmUlqWi7xIiJGGkGYEKZ7V+sKBUTAaf6j3mXmAE89ct/bJOPUZ?= =?us-ascii?Q?RTIKyDhr96gyFvuoCgGkzO6IE4tarhSxmGgdjxeknAGBj+Gz2S/Z2yvRWqA7?= =?us-ascii?Q?pgB2oXcsq1Zwrwjls3/7Fc7CblQRWjjrbxkwCSsSmvSaH+NmiCHsiAjOHAjw?= =?us-ascii?Q?BVIXIgA5Kb41uXwmC5E572Vfe5vQPKMQuhf9rPCBbOExy2no75VTYk7Lq960?= =?us-ascii?Q?pcQIPID2VIIGOv8cvdxQkmo4SW46JWdgJXjow4/rQOqQoKY6tbv8LAnI6zMx?= =?us-ascii?Q?6Esc5BP5q1MmuLvKPgLbZ1ugZW1i?= 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:(13230040)(376014)(1800799024)(36860700013)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2024 09:34:28.5081 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5dc6873c-8985-40e0-7849-08dce9d7e72b 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: SJ5PEPF000001D4.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR12MB8990 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Extract promiscuous and all multicast configuration restore to separate functions. This change will allow easier integration of disabling these procedures for supporting PMDs in follow up commits. Signed-off-by: Dariusz Sosnowski --- lib/ethdev/rte_ethdev.c | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index f1c658f49e..362a1883f0 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -1648,14 +1648,10 @@ eth_dev_mac_restore(struct rte_eth_dev *dev, } static int -eth_dev_config_restore(struct rte_eth_dev *dev, - struct rte_eth_dev_info *dev_info, uint16_t port_id) +eth_dev_promiscuous_restore(struct rte_eth_dev *dev, uint16_t port_id) { int ret; - if (!(*dev_info->dev_flags & RTE_ETH_DEV_NOLIVE_MAC_ADDR)) - eth_dev_mac_restore(dev, dev_info); - /* replay promiscuous configuration */ /* * use callbacks directly since we don't need port_id check and @@ -1683,6 +1679,14 @@ eth_dev_config_restore(struct rte_eth_dev *dev, } } + return 0; +} + +static int +eth_dev_allmulticast_restore(struct rte_eth_dev *dev, uint16_t port_id) +{ + int ret; + /* replay all multicast configuration */ /* * use callbacks directly since we don't need port_id check and @@ -1713,6 +1717,26 @@ eth_dev_config_restore(struct rte_eth_dev *dev, return 0; } +static int +eth_dev_config_restore(struct rte_eth_dev *dev, + struct rte_eth_dev_info *dev_info, uint16_t port_id) +{ + int ret; + + if (!(*dev_info->dev_flags & RTE_ETH_DEV_NOLIVE_MAC_ADDR)) + eth_dev_mac_restore(dev, dev_info); + + ret = eth_dev_promiscuous_restore(dev, port_id); + if (ret != 0) + return ret; + + ret = eth_dev_allmulticast_restore(dev, port_id); + if (ret != 0) + return ret; + + return 0; +} + int rte_eth_dev_start(uint16_t port_id) { -- 2.39.5