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 097EDA0C4C; Mon, 12 Jul 2021 14:41:14 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7CF9E4069D; Mon, 12 Jul 2021 14:41:14 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2044.outbound.protection.outlook.com [40.107.93.44]) by mails.dpdk.org (Postfix) with ESMTP id 46D4C40685; Mon, 12 Jul 2021 14:41:13 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kdptKtdOnnaBO6a5CAfNQPWXGp0H+ghApPtSw8bPvZWL9meKVfkUEBtnptFnmjcaOYbpPJnSVt0TxGQYCGg+huSb5KRv6S7gzMN/s2mnOUcrYeGajFrCkaAwE0mTIuHL/5zwgyD0cjq+b1zRlsks71BGECiva/pIvGI4VYBr68KH4Aw+/7iVtHfgOKp9mo0NzBXGpBFgGkmTUYK1xg1m/IoW++MplS8xT76SfNIMjxnQqEPGpXzk70WTbGurT11ye7tQg18s6Iizjadg7AzjQCBVhFqGEQsdGNRrxwCYD1Cah8ybTvUx+8HdZ8pYRa7DocUUoFLEWTMD9v3P4n8bcA== 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-SenderADCheck; bh=ZPf6OIDiF3vi0lP23Equ82nURHLxZXt2PEUlaUWpazo=; b=hqIF2HXpXhGMkN82g00uOkND2suUVmeQtfYon8UnDdE+draAV+ok6SpdlpPN75Izu50nkZQ4NYBfnsMwQJnwsj9IXtaKp6+AH21VrPE4bXq7gYJXyuEbjRnHWSthE/Otg6VTUyYm6BynvRW+VF9dnuUehlR8IP8SjK/Q5V/zz9/LB4tCeJnNPu6MZg0p689cN8eqUiCi2UAUQa8JD5xRytp2v0u8+QVNB6l2Xn+wF6u19uVlyPsu1yfYXDQGPaZF3eSur218eZtAmytGYvt4TGrnbg+3TYwNRK3jgaMj6JGMPcjKiUy/03SEhlu8rF8UQbNPfdVd8UhnjTr7f4n2qw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=solarflare.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none 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=ZPf6OIDiF3vi0lP23Equ82nURHLxZXt2PEUlaUWpazo=; b=tXSGf4nEQlBnXTQekkMr0DZlRagkA5UHYnHW3EXAqu6KJnNtyB1kth3pV/rFM0M2R4yuhJMED1LSHyzTxtHNrKGBVITFOA7xDNQZAv4e6Knwq2LUsCWNgwUPMQ8az+wBWrKze+Qtv79b1GSFEplpaxgUuzpFud8MFTyMLhdxRlG4P8B5iFK348rNJV3j65+gi6qdeaWbkawNzeCmKaJq3swvTsyInz6WfLUcSPKomVunnx6P5nTl2aW3zi7F2ZUFsXXLl2hboevqvE1CJUf/PDNpriwSmwWT1G1/PtRAAgR+TsDCX1OE6W0u10Cde7GrSwBnz1GHSzBuwzVngAZbjQ== Received: from MW4PR03CA0227.namprd03.prod.outlook.com (2603:10b6:303:b9::22) by MN2PR12MB4142.namprd12.prod.outlook.com (2603:10b6:208:1dd::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.22; Mon, 12 Jul 2021 12:41:11 +0000 Received: from CO1NAM11FT053.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b9:cafe::85) by MW4PR03CA0227.outlook.office365.com (2603:10b6:303:b9::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.21 via Frontend Transport; Mon, 12 Jul 2021 12:41:11 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; solarflare.com; dkim=none (message not signed) header.d=none;solarflare.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT053.mail.protection.outlook.com (10.13.175.63) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4308.20 via Frontend Transport; Mon, 12 Jul 2021 12:41:11 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 12 Jul 2021 12:41:09 +0000 From: Viacheslav Ovsiienko To: CC: , , Date: Mon, 12 Jul 2021 15:40:53 +0300 Message-ID: <20210712124053.29989-1-viacheslavo@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20210619154012.27295-1-viacheslavo@nvidia.com> References: <20210619154012.27295-1-viacheslavo@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9e0c5bb2-05cb-4aed-6f9d-08d945325418 X-MS-TrafficTypeDiagnostic: MN2PR12MB4142: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:159; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZyJYl0KKm4xHsFYQdbzsADKayPh5rIfc3w+qd1lltD30e7tnmFabgFocrLHTtgYEBxGAFLGl0J8nKShlt0h2vCMgZlct3PFf5qu17HTlo75NvBT718T1KN3EE9E+c5vjKrT++n0Ht0eUxM2gaL5MH1ORtwNQx9v5yhvrXaO1emcRjK0AjrNPocOPVEEAYk/zS+KJNLtZCy11SBt8O7vpvyZvxsuNxHzJUmBmUDWGy3dUKODeEda0xuV19ojejfS0HUwByDh3u0TDBoh2qV4y8BIF8Rys1cXyTc/imOL/qWmF1TpK2OYG/135dn9oakwTxvEjOq08d7cTDxNgEcAZYrjMrjiOpjXj/Rn3AnYBizDcNcxmaDAm2N78q4Iv1wNt+LDVCuJfuJm5SesXa+BqnNIOkLiikZXcpY/v1qi/9PBilru5JJREin7A+Pw1koWnkXGNN7ISL8k0C3Jc4wI6F+NXBkqPbAxyZXqkQv+sBRQ1f8ajhIYU+CUlFjm5h1x82YQp45sqerCd0snSD91RNdywlJkhZYpeeYK0LB5HzMVf/5rnT0YQC74uNfwp2g9HSdNo1l8DJO6oPBUtovdAxxevoNbnGiYIrqzKgpHCbWsAUZlJMhhvwi7b/AgFvtPIu5ociHX12iy056oYK7BRamy3C72USIzZA3+0ipF7uiffpfX27vxgp8zbdboXH2aFtFswgFqGbBFt8qTyiCfATkcUz+M0z0E4iFeJNx4GkcSTnN1HcmosiNmssnkK80YYSZD9YSl9GBixG4Kl5AuXHsVHnGkZH5WqBQV3SG8Szc+lq83vbW8MX8rdcCrldm43/9g0LA0w+cQS8ARlzu04UVxHok/+jRyRZQy4mV5cYx8= X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(39860400002)(346002)(136003)(396003)(376002)(46966006)(36840700001)(26005)(70206006)(36906005)(6286002)(86362001)(2616005)(8676002)(966005)(36860700001)(47076005)(6916009)(82310400003)(54906003)(478600001)(34020700004)(55016002)(70586007)(316002)(426003)(1076003)(83380400001)(5660300002)(186003)(36756003)(356005)(6666004)(7636003)(7696005)(4326008)(8936002)(336012)(82740400003)(2906002)(16526019); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2021 12:41:11.0195 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9e0c5bb2-05cb-4aed-6f9d-08d945325418 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT053.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4142 Subject: [dpdk-dev] [PATCH v3] app/testpmd: fix offloads for the newly attached port 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 Sender: "dev" For the newly attached ports (with "port attach" command) the default offloads settings, configured from application command line, were not applied, causing port start failure following the attach. For example, if scattering offload was configured in command line and rxpkts was configured for multiple segments, the newly attached port start was failed due to missing scattering offload enable in the new port settings. The missing code to apply the offloads to the new device and its queues is added. The new local routine init_config_port_offloads() is introduced, embracing the shared part of port offloads initialization code. Cc: stable@dpdk.org Fixes: c9cce42876f5 ("ethdev: remove deprecated attach/detach functions") Signed-off-by: Viacheslav Ovsiienko --- v1: http://patches.dpdk.org/project/dpdk/patch/20210619154012.27295-1-viacheslavo@nvidia.com/ v2: http://patches.dpdk.org/project/dpdk/patch/20210712102440.12491-1-viacheslavo@nvidia.com/ - comments addressed - common code is presented as dedicated routine v3: - uninitialized socket_id issue (reported by CI) - removed dead code for port_per_socket from init_config() app/test-pmd/testpmd.c | 151 +++++++++++++++++++---------------------- 1 file changed, 68 insertions(+), 83 deletions(-) diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 1cdd3cdd12..a48f70962f 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -1417,23 +1417,73 @@ check_nb_hairpinq(queueid_t hairpinq) return 0; } +static void +init_config_port_offloads(portid_t pid, uint32_t socket_id) +{ + struct rte_port *port = &ports[pid]; + uint16_t data_size; + int ret; + int i; + + port->dev_conf.txmode = tx_mode; + port->dev_conf.rxmode = rx_mode; + + ret = eth_dev_info_get_print_err(pid, &port->dev_info); + if (ret != 0) + rte_exit(EXIT_FAILURE, "rte_eth_dev_info_get() failed\n"); + + ret = update_jumbo_frame_offload(pid); + if (ret != 0) + printf("Updating jumbo frame offload failed for port %u\n", + pid); + + if (!(port->dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)) + port->dev_conf.txmode.offloads &= + ~DEV_TX_OFFLOAD_MBUF_FAST_FREE; + + /* Apply Rx offloads configuration */ + for (i = 0; i < port->dev_info.max_rx_queues; i++) + port->rx_conf[i].offloads = port->dev_conf.rxmode.offloads; + /* Apply Tx offloads configuration */ + for (i = 0; i < port->dev_info.max_tx_queues; i++) + port->tx_conf[i].offloads = port->dev_conf.txmode.offloads; + + if (eth_link_speed) + port->dev_conf.link_speeds = eth_link_speed; + + /* set flag to initialize port/queue */ + port->need_reconfig = 1; + port->need_reconfig_queues = 1; + port->socket_id = socket_id; + port->tx_metadata = 0; + + /* + * Check for maximum number of segments per MTU. + * Accordingly update the mbuf data size. + */ + if (port->dev_info.rx_desc_lim.nb_mtu_seg_max != UINT16_MAX && + port->dev_info.rx_desc_lim.nb_mtu_seg_max != 0) { + data_size = rx_mode.max_rx_pkt_len / + port->dev_info.rx_desc_lim.nb_mtu_seg_max; + + if ((data_size + RTE_PKTMBUF_HEADROOM) > mbuf_data_size[0]) { + mbuf_data_size[0] = data_size + RTE_PKTMBUF_HEADROOM; + TESTPMD_LOG(WARNING, + "Configured mbuf size of the first segment %hu\n", + mbuf_data_size[0]); + } + } +} + static void init_config(void) { portid_t pid; - struct rte_port *port; struct rte_mempool *mbp; unsigned int nb_mbuf_per_pool; lcoreid_t lc_id; - uint8_t port_per_socket[RTE_MAX_NUMA_NODES]; struct rte_gro_param gro_param; uint32_t gso_types; - uint16_t data_size; - bool warning = 0; - int k; - int ret; - - memset(port_per_socket,0,RTE_MAX_NUMA_NODES); /* Configuration of logical cores. */ fwd_lcores = rte_zmalloc("testpmd: fwd_lcores", @@ -1455,30 +1505,12 @@ init_config(void) } RTE_ETH_FOREACH_DEV(pid) { - port = &ports[pid]; - /* Apply default TxRx configuration for all ports */ - port->dev_conf.txmode = tx_mode; - port->dev_conf.rxmode = rx_mode; + uint32_t socket_id; - ret = eth_dev_info_get_print_err(pid, &port->dev_info); - if (ret != 0) - rte_exit(EXIT_FAILURE, - "rte_eth_dev_info_get() failed\n"); - - ret = update_jumbo_frame_offload(pid); - if (ret != 0) - printf("Updating jumbo frame offload failed for port %u\n", - pid); - - if (!(port->dev_info.tx_offload_capa & - DEV_TX_OFFLOAD_MBUF_FAST_FREE)) - port->dev_conf.txmode.offloads &= - ~DEV_TX_OFFLOAD_MBUF_FAST_FREE; if (numa_support) { - if (port_numa[pid] != NUMA_NO_CONFIG) - port_per_socket[port_numa[pid]]++; - else { - uint32_t socket_id = rte_eth_dev_socket_id(pid); + socket_id = port_numa[pid]; + if (port_numa[pid] == NUMA_NO_CONFIG) { + socket_id = rte_eth_dev_socket_id(pid); /* * if socket_id is invalid, @@ -1486,48 +1518,14 @@ init_config(void) */ if (check_socket_id(socket_id) < 0) socket_id = socket_ids[0]; - port_per_socket[socket_id]++; - } - } - - /* Apply Rx offloads configuration */ - for (k = 0; k < port->dev_info.max_rx_queues; k++) - port->rx_conf[k].offloads = - port->dev_conf.rxmode.offloads; - /* Apply Tx offloads configuration */ - for (k = 0; k < port->dev_info.max_tx_queues; k++) - port->tx_conf[k].offloads = - port->dev_conf.txmode.offloads; - - if (eth_link_speed) - port->dev_conf.link_speeds = eth_link_speed; - - /* set flag to initialize port/queue */ - port->need_reconfig = 1; - port->need_reconfig_queues = 1; - port->tx_metadata = 0; - - /* Check for maximum number of segments per MTU. Accordingly - * update the mbuf data size. - */ - if (port->dev_info.rx_desc_lim.nb_mtu_seg_max != UINT16_MAX && - port->dev_info.rx_desc_lim.nb_mtu_seg_max != 0) { - data_size = rx_mode.max_rx_pkt_len / - port->dev_info.rx_desc_lim.nb_mtu_seg_max; - - if ((data_size + RTE_PKTMBUF_HEADROOM) > - mbuf_data_size[0]) { - mbuf_data_size[0] = data_size + - RTE_PKTMBUF_HEADROOM; - warning = 1; } + } else { + socket_id = (socket_num == UMA_NO_CONFIG) ? + 0 : socket_num; } + /* Apply default TxRx configuration for all ports */ + init_config_port_offloads(pid, socket_id); } - - if (warning) - TESTPMD_LOG(WARNING, - "Configured mbuf size of the first segment %hu\n", - mbuf_data_size[0]); /* * Create pools of mbuf. * If NUMA support is disabled, create a single pool of mbuf in @@ -1610,21 +1608,8 @@ init_config(void) void reconfig(portid_t new_port_id, unsigned socket_id) { - struct rte_port *port; - int ret; - /* Reconfiguration of Ethernet ports. */ - port = &ports[new_port_id]; - - ret = eth_dev_info_get_print_err(new_port_id, &port->dev_info); - if (ret != 0) - return; - - /* set flag to initialize port/queue */ - port->need_reconfig = 1; - port->need_reconfig_queues = 1; - port->socket_id = socket_id; - + init_config_port_offloads(new_port_id, socket_id); init_port_config(); } -- 2.18.1