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 49C8845B17; Fri, 11 Oct 2024 20:52:19 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EDA0A40EE2; Fri, 11 Oct 2024 20:52:16 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2042.outbound.protection.outlook.com [40.107.100.42]) by mails.dpdk.org (Postfix) with ESMTP id 8D3C240EDD for ; Fri, 11 Oct 2024 20:52:15 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HiMT/3HjwUFgtKczLW8qb648OYvfGWhFapehAnnSNlgldsY9BzxPIq2ca4iHhaLSRb6CIu8ViMfAvY104uveN3/dP9z2VcmM5TulGSAFYehahNhpOqb3P7lnm1k+D2j4/eTNsqZ/rWI3tA+e1wk/exyPBAuj7G48bMdPZhtos/2RNgUvfc7u2Qr9rIuLZ/pvxByyaotoOKUZJvnsiSC5f8JVJDZUqFFsZIfl4bevSNo8H9rmBPJiUKtJ9GjvNZIqODWY55g0ny/UAsyhOAoG7/6ct5AuOBDCdAMIYYN60v+wz3tY9I1vNC8Ldl3gSOgi3uVXTJzSCjXXty0yO/QDFg== 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=DlF16nBJcQjLqCeNLrFHkuI9deVdy3WAE2eOzB8bV3aHWmeUZlZi/LyaLqNr5cm1M6BzobaKJSxHQZZm1glMcOASGziJudWMj+MCZmmt9ME0FRvPhuyqtDb0ET3UkFTtTW0sibX9Qj41yKXDkpARUBiLA7DuZU8cBE9NgnPHhJ7tRKQ+WPjN4rCrTWz8axq9BRSjqBpWRqmLA58/NASMi3p5jsIjvwbiKi4hepoccljyr2gpKu4bg/Pcfe2wTNdgIfRltny/IrBWLVWMOT/UPJ2jmkIAaMAtmxR5LsjIA1hIPqCjzhpR/LNzvUpiSZCMiTt+19tD72vesBA5kQKExQ== 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=OO26fQiE0t8UzNuOMtSMgPNN6KgjHS0kOfPuNTrHYBZ1j4XEi9s6+b7Jj5h2gp3D6BxMJseVXmgFzjJKW5qeceC1SqR0yXflabX1AEDoTljePCd7F2wACLNXnVRykh2JQLrBDkAmF2wISE3wlJzS2F/kbYZTiVW14uutw7GT3xJJAN/pLX2uwkvT7Q2KS08alpn+H8NCLDY1wnrbezNlHtRNFbN5O1I14x65IKWMJ02UlSUuvHegscB+Ibg7TVkpEvTapMtNq6qEp6TJrlvy3iIojVv4066A/2X4kDXC+kGhvsa5z1B1+zrGFOWXDrbLWYn/JoLLorwthdPfjwELQg== Received: from BYAPR03CA0007.namprd03.prod.outlook.com (2603:10b6:a02:a8::20) by LV3PR12MB9438.namprd12.prod.outlook.com (2603:10b6:408:212::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.20; Fri, 11 Oct 2024 18:52:10 +0000 Received: from SJ1PEPF00002317.namprd03.prod.outlook.com (2603:10b6:a02:a8:cafe::98) by BYAPR03CA0007.outlook.office365.com (2603:10b6:a02:a8::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.20 via Frontend Transport; Fri, 11 Oct 2024 18:52:10 +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 SJ1PEPF00002317.mail.protection.outlook.com (10.167.242.171) 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 18:52:10 +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 11:51:55 -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.1544.4; Fri, 11 Oct 2024 11:51:54 -0700 From: Dariusz Sosnowski To: Thomas Monjalon , Ferruh Yigit , Andrew Rybchenko CC: , Konstantin Ananyev Subject: [PATCH v3 1/4] ethdev: rework config restore Date: Fri, 11 Oct 2024 20:51:34 +0200 Message-ID: <20241011185137.277874-2-dsosnowski@nvidia.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241011185137.277874-1-dsosnowski@nvidia.com> References: <20241011093351.187191-1-dsosnowski@nvidia.com> <20241011185137.277874-1-dsosnowski@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.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: SJ1PEPF00002317:EE_|LV3PR12MB9438:EE_ X-MS-Office365-Filtering-Correlation-Id: 25aef25c-798b-4788-a814-08dcea25d000 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|82310400026|376014|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?dHJAoxITfTcfL7AUCWEL1uQn4pr0OC3gDh1vZ2+pkqnkiTei0BdNpkLQ9IAA?= =?us-ascii?Q?N9AbTkxlUwS7g1bpNNo58cXtD3Re0+0uSvgl7t+/L1dxP2EbKEBuAEyxCogj?= =?us-ascii?Q?gcSzBwmW8NC2da8vWsoj77JQHmSfEFn9ta0RLe1K/YKzJNPlVo1h+1XDy9yz?= =?us-ascii?Q?ScGEugBDRxB8wuG29U1YUM54+HQNpP1IzBMQeWCeoPbOC3h6MCRl1TPuGjzK?= =?us-ascii?Q?T8wMv2aZddq9rTXSIhFkuxsMByTkZroJ8M93HLqF8ghBMIZ1XQq5JsnN1gJI?= =?us-ascii?Q?XV6UR8JpLpmq2HjD1fHyRAZeJR3xdHfPAvzsZZzo/612LlL1woFjnKikNKeH?= =?us-ascii?Q?562/eF2G2hNJps96QhrgFEfj1OFsUazfwEqIQdlsqleB28V7iVVIStAVzEr5?= =?us-ascii?Q?y3IdxLUCnaazV9WIv7qGvuSR9UnnGvNOqfItCPn5OFPQC4IXS6uf13K3xFmz?= =?us-ascii?Q?3mfgXE5kbW5KKbRm5HIMOOdtHw7KhCm6pf2u0CIDr/h3rVatjbcTna4I84s9?= =?us-ascii?Q?yomX3MEnnNtw2wMNn2SuJZLj93l5s8NOlNEInbP5vz2SEFi3tTqMPUmg0IvA?= =?us-ascii?Q?2NcC26VmhhwiLz+TducALjUIAD/FLn8vvfygJh9Y1Rul2kTL1kY02KLVAAFz?= =?us-ascii?Q?yxQ6sY4SGX54l0JyBltY2EoMCkDVsSs9Qi9YpdsqN0MLgIW/arhc9sIJdkYi?= =?us-ascii?Q?rT9X89jGUKiToIU6v5UJfJVCduIrqeEkfZoH8r25PR1zsIc566PPC8MyUi/b?= =?us-ascii?Q?5vWJRupAzCO4IHfrQ308W2RAl2zSOW25lZETbUDUMI1RXFsJzgh1jlrIYeaG?= =?us-ascii?Q?S3J1m3/xM9K3bgcTTxzFy33pHKnqiPVCHonArP8g4EYlX3jnOqt20LF8cNaD?= =?us-ascii?Q?RP+NOh0TsGgwiYJS1wEZdpg2k36OpY6HbN7Niw7gDeqVtfI7Y18pP9GngSlj?= =?us-ascii?Q?Hj6blp7561RKusdLt9zBGQ9oxDb1Ih08RKb/bWQIp+YS+PQBlZ47tSmovc7P?= =?us-ascii?Q?1IAA0Tl4igVS7ItWeV4UaqcnnbIhL0QCMsbRLXkwAe1xDAufcRu+KuR7UKL5?= =?us-ascii?Q?6MWEomnSid99ipcRJplUJ1C6EaiNAFqQVOXz0nHUnHT8Ah8kj2UavHbNvCon?= =?us-ascii?Q?5QkLugqX56GUKjZxmLlF0KJOXT2plxq8QyGOZSnu0zaXNzVmQC0NpcuXjwUO?= =?us-ascii?Q?HX7+vgNUxQciu3/GiR3C+8v8Rfjggm/szHpMTTxh1I4XsKUMCbKVwQhWk6ce?= =?us-ascii?Q?Zci56sRato19GwgbB4eTcHbqy66uvuabuecoJidINmkL4pzGofZqP0scI/4I?= =?us-ascii?Q?PPfv30pI6VR+Fa3YvtwwxRGBfKpgCpgt9fX2ASZyPy9v9BWEpPBeTjNgRH5f?= =?us-ascii?Q?0muEETeXNnqI1DaLVlXNO1z4QpHw?= 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)(82310400026)(376014)(36860700013)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2024 18:52:10.3848 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 25aef25c-798b-4788-a814-08dcea25d000 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: SJ1PEPF00002317.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR12MB9438 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