From patchwork Fri Feb 3 07:57:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 123002 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2583641BB9; Fri, 3 Feb 2023 08:58:15 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4257C42BFE; Fri, 3 Feb 2023 08:58:04 +0100 (CET) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2104.outbound.protection.outlook.com [40.107.100.104]) by mails.dpdk.org (Postfix) with ESMTP id 4D62A41140 for ; Fri, 3 Feb 2023 08:58:03 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jfc6GJ1WGVFDTLbvjelffISNuWaGNMksMHY3CkeVN3eYmgJnS+hwx9WJbOfqPPEJdZkyzhexUqRI3AffbI+TeN0iiC0DauSKiD1aRCMOVBk2D6wLfUMQieUDFkW9eNByOZz4owSk0+Kp2hkSK6N0eP5tYueE9W3h0l+ucXcp1W1XePsF23ND4l8+l//kcwlHQhbtWg7TJScg0pbZBqqV1+wuEhcugheqk2jKdQ6gzXnUKGPImHCl+z2dhKsaEmuUy9sjas3nsmwriSWnpoSVLLMVvrOgPfn6pPv7GUlop4FDxYCOsKARIBseDfOwxHEiXCT1R/svERvlqhaNLbUr4w== 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=jQLbovZoLx+AWwoqMkZxe+q+6k/RpFNxc0/lp/dID2I=; b=Q39dfhnYGo1eTzzOWzDIw2OHofyiDm0uomjE2cmw2jR3UCsK3F1SGiOZXb7ym2BHJG2Y2bqp7jCxm7k0c2wx09ijmmDE3M/GZtp/VVZEhnCTUl74AkYpBL3/Ja4zhk1yZwujDceJK7dnFeSRGZb51Un7CQyPtX9Mns0bHlebAzRMj/TkLAKFwb5MiIYqVPdB3mhxJHDOUdmYPo0MHesdSX+/qt4Qt7kA11/wdFWbAak8VtqLjOcD541wztqdvVVAF5TmQkjJ4C0a3Lldj6WSA68PLRBwfgnAk+/0gR5AUPexu1UXqi/SEZ63Nti3ZkdToZMv5x6muFpL8PlycNysHA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jQLbovZoLx+AWwoqMkZxe+q+6k/RpFNxc0/lp/dID2I=; b=ZqeQwf3ccYVRNGSLvkh1EKhYoy0FlxImxHps2Maq+VPFkdsf69k2IBRbKYv0AVVZhXAhc5ylxJzp/QxSMf7tFs0bI10Zrr38Q+nb33RlyrrXy6DEkpC4p2wafrSGwIbtHh679XB0sUktMi/YY0QZh+/n19F4NOROwhR2HtkNg44= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by PH8PR13MB6292.namprd13.prod.outlook.com (2603:10b6:510:257::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.27; Fri, 3 Feb 2023 07:58:02 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::7ea4:e421:5dd5:9f4d]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::7ea4:e421:5dd5:9f4d%4]) with mapi id 15.20.6064.027; Fri, 3 Feb 2023 07:58:01 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, James Hershaw , Chaoyong He Subject: [PATCH 2/3] net/nfp: remove panic usage for multisegment Tx Date: Fri, 3 Feb 2023 15:57:35 +0800 Message-Id: <20230203075736.18616-3-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.29.3 In-Reply-To: <20230203075736.18616-1-chaoyong.he@corigine.com> References: <20230203075736.18616-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SI2PR01CA0014.apcprd01.prod.exchangelabs.com (2603:1096:4:191::17) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH8PR13MB6292:EE_ X-MS-Office365-Filtering-Correlation-Id: 1305119b-b8e5-4879-5eb0-08db05bc5f75 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DIs1uyEt3t4HJE0YggxwmwDHyjUfQXi7fLyFmdSOOr3AZegJP/2ccjwSSuqJKQ3EnXqXGsjZC74zKhautI/1AnxC3Hxju4o1dYKdqZp2BZr0hwwgYC6ELuiZT5g96JdS+fKikfg/a72Yb7MuaQc/opA/4/ATvoMB8AiOTbNZ0mYrqRnDsXSRKg+m0HRyEIv1SU/zSuShVJv3ib3aATmOUz64IXYZi2a14t09kKlOHeJWmfVse5Yp8eYE5MN4kjb3wgEn79JlDVbB9nQQXQfsRLYh63ejNpKTq/4cSyMJlSchHnGIt+/D27JNk/pjw7ls+oycVVvkZVfLDVSX/v8HVJkJl7p7xD2J2tHjRP3+dTJuwakPO2ZuS4wWYatHRom4Wo3GIIwCFm3iFxfBEI/Y7IxoriXVDWK8+y3MPddLiDbJEHBO0YcJTrNIMXuE+v2L3bjMEIP0+qSHnBSjrJR8zNcvUs9sFbkiUEU+l8iqNNjgeqNGCEuG3dDXX2rlYCwCVFkTd8NGwZ1HeMzrtkode/4yGF8nAw2BbPFD0/jyiHp222chJImYgeBzoSIg1arTltPnFoRa3nj2Ig6LBt5yv72ScCyJgKSF31t3/DW2IdBgann5LC7oRhT4tX1s6o6jF3c9sBj3D0OkVx5loToE3RrpsKlbuLdZFU5j1osRxwyqy8gIe/D6Xd3vvRQcH8Lrm0IHN123KG1FXUMceT6I3fwJ/2yrbqcdKf8i+g7V8UeAS/8mQoaly58PnLEHeqAz X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(346002)(366004)(39840400004)(136003)(376002)(396003)(451199018)(26005)(186003)(86362001)(6512007)(6506007)(1076003)(107886003)(6666004)(478600001)(6486002)(38100700002)(38350700002)(52116002)(2616005)(36756003)(2906002)(8936002)(5660300002)(44832011)(41300700001)(83380400001)(66556008)(66946007)(4326008)(66476007)(6916009)(8676002)(54906003)(316002)(66574015); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?7LnqymzPqroO7aKfwbz5RJnitojG?= =?utf-8?q?arOkFc7eh0IFrXt+R9AZ9gtrVr8Y3Wl2CSSkQcF1rwKeL/Z+TnxxzcWzT7oKyzoT/?= =?utf-8?q?8sBc2Kbzgvqn5+dcSqfqwnuXifYkss9VI3rYinP9VFjdcgRsSqbAndtisuDUCQB57?= =?utf-8?q?e7aAGi0ekN5yIczJ2KZ3q0+wZ7Ib9H7dQrnWfuoxHzSDepewMmII7MXenKq1/1Ct+?= =?utf-8?q?Kj3CIT3OJg4w1uIHbYYOc2rSZLwNwSyURzlhTiC2dp5k5ZgmQpSNVEyAbypEbHzi0?= =?utf-8?q?yiy199uornrfeRwq8JvYELyE7hIACmgs2YN7N0iyF2ZfUtTutjLBYKuQBS3e/h5gS?= =?utf-8?q?TCbg0bznA53jHtZ15eMGroYGoepddEQ3Mnqx79W7jU1Lxnp5VReR7ODwAcSDFtsoH?= =?utf-8?q?BEdyyzFg8lFh6aAkDjpyvuhCxqlITDmjNpMtdyip9CbflQoYWeh6yPhnanlAE8YPC?= =?utf-8?q?98v0gX68oj3xIi4pT3dNgpKsMAPBvxQUKsauRhPXVvMJGz22W4rO5+qfLyVhWAiBm?= =?utf-8?q?T7EJq2wPmFIP5xLDyuhTZ4iMIBeQV6rF5paeuriDkJGIkrLOVQy9XQteqGd5Om3yy?= =?utf-8?q?IGwbep9bTp6yBfm13S7w6X/63anKxErJ89lt/W95doyr6U12p6HI1Kf+9Gwnawooo?= =?utf-8?q?NvkoLuUjiSbVfuMdE8j+UJGdqVGObeY2J5NyN3g1gQhIW9/NdxsHiyXGVjnE3jH3n?= =?utf-8?q?rJxmKFsxRZ+5wAjvPGDSny+vE8mBWLoRChqkE+eZbAjiUoIkh9Guiy9lRY/VLXHt0?= =?utf-8?q?f/QO79M1ZJPF9jeo67MJcrUfnXLyexOI2eG7ttJK0w4WduhuGQ/N1qd3CJLfYAQlC?= =?utf-8?q?tsk0RskEsCA6ks/YL0+wnVuexQkJc+L7AMbMStCt6/3ZgYI4HAPWdL9eYHf8wJd5y?= =?utf-8?q?IfyF5F0XOvFjk7oyTXFiKUEw6l3mAV20A6QblvwwkXWk6YktaUcHtZFk1i+aFm65t?= =?utf-8?q?4y0e0aVFVeLfwsrUaRStEgF/Yg+5b5BA4cXU2pvw072YkL4kHRbYta33WReIEdtk4?= =?utf-8?q?pZV/LspNoo4q0A8UeR5ZtuNwtDyQrJGUlgPldWayP/HTF2w138/W3b3Ny9L3EXMmP?= =?utf-8?q?CM1uQ6eWTuClM/rnargNn/mu6upuZ5iXdBabURfHcwkwsR07N2oBO6N2LslCNagPY?= =?utf-8?q?kWxS1AKlHhRsEXCzvFxZw4OCTxuz/GSakS2PMzLRk2vdOmcJ9SCodlzffZXQJJQUM?= =?utf-8?q?afV6Sq6n8uQdpFuyoZ6g8TJXMgp6MfC4HZ9EISYqAWGhQQ6EEqLcuQb4LLxXs28La?= =?utf-8?q?GC6TCrfoh9ALr96whQQfIpYrQTLd43LOJ87a2ewqDBiYyUbWot0Mi2MLOb1UVmOXC?= =?utf-8?q?BR4qeY4NhS7GDuh9NJl5ifVkMCxh/3u40z1tiYZaGKsdME+n+C6FktyIWJDhJct77?= =?utf-8?q?vBJpIaRd898STfkAymxEBhT+BwvSn9COkAftqoX2Bsw0j/FJ7aL+lc3Pi13yIqP/f?= =?utf-8?q?68/Sd5wih+VSC6TCC885nx+ShZuEOsg5pcepUctPGunOwLwaVUH4v78mzy/EbE/ox?= =?utf-8?q?NK2yfSUUqZbeL5QdQ6Fga7hmEwTF8jqMrQ=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1305119b-b8e5-4879-5eb0-08db05bc5f75 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Feb 2023 07:58:01.8606 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: +OPWlfGCJBuvMmnCiRyiGRcik9PT2MwqlimfNRZVpQHL9COzHN6I33dvyrsMPzJd4AgQI60YMsnRDcqqjb8XKfZjguM/0Yql5YOyn1tmySU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR13MB6292 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 From: James Hershaw Remove usage of the rte_panic() function from the nfp PMD. Update the nfp_net_nfd3_xmit_pkts() function to match the functionality of the nfp_net_nfdk_xmit_pkts(), rather than use rte_panic() Update the logging within both the nfp_net_nfd3_xmit_pkts() and nfp_net_nfdk_xmit_pkts() functions to only make use of a single log when encountering a transmission with multiple segments when NFP_NET_CFG_CTRL_GATHER is not set, and to change the log-level to ERR. Signed-off-by: James Hershaw Reviewed-by: Niklas Söderlund Reviewed-by: Chaoyong He --- drivers/net/nfp/flower/nfp_flower.c | 3 +-- drivers/net/nfp/nfp_rxtx.c | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index 7b46dc0f6a..e0e94e0a36 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -532,8 +532,7 @@ nfp_flower_pf_xmit_pkts(void *tx_queue, if (unlikely(pkt->nb_segs > 1 && !(hw->cap & NFP_NET_CFG_CTRL_GATHER))) { - PMD_INIT_LOG(INFO, "NFP_NET_CFG_CTRL_GATHER not set"); - PMD_INIT_LOG(INFO, "Multisegment packet unsupported"); + PMD_INIT_LOG(ERR, "Multisegment packet not supported"); goto xmit_end; } diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index 4a7574fd65..5f23128ac9 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -986,8 +986,8 @@ nfp_net_nfd3_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pk if (unlikely(pkt->nb_segs > 1 && !(hw->cap & NFP_NET_CFG_CTRL_GATHER))) { - PMD_INIT_LOG(INFO, "NFP_NET_CFG_CTRL_GATHER not set"); - rte_panic("Multisegment packet unsupported\n"); + PMD_INIT_LOG(ERR, "Multisegment packet not supported"); + goto xmit_end; } /* Checking if we have enough descriptors */ @@ -1466,8 +1466,7 @@ nfp_net_nfdk_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pk if (unlikely(pkt->nb_segs > 1 && !(hw->cap & NFP_NET_CFG_CTRL_GATHER))) { - PMD_INIT_LOG(INFO, "NFP_NET_CFG_CTRL_GATHER not set"); - PMD_INIT_LOG(INFO, "Multisegment packet unsupported"); + PMD_INIT_LOG(ERR, "Multisegment packet not supported"); goto xmit_end; }