From patchwork Fri Feb 17 02:45:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 124098 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 123A441CB7; Fri, 17 Feb 2023 03:46:20 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D7ACD410F6; Fri, 17 Feb 2023 03:46:14 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2097.outbound.protection.outlook.com [40.107.220.97]) by mails.dpdk.org (Postfix) with ESMTP id 8329640A8B for ; Fri, 17 Feb 2023 03:46:12 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jpuKvbh0WuPVVnQQvIbx/zVK/WyWJjY8PAvJPYmALc+XFa0LwNapPK+w8zi1groUfeCvQdzv4ctNqToaI/fMMqzaGOIxerF8seOytRlEmmLcRhZeQYhk/6vUN1roe1aYnmbjD2CPBS9B+lZ2gBXPIpSqnCK5esGPemirQxppnhsW7BmpmwNo+tE44eJF9fcBqlvZPXOYrxuDf4/GjFzr8UZB0LRaLx6tRTEzC/UkyZyBAmrSlTXaW10HEXKrMFZPyoL3pe1XMVn/UHmbzA7BrH0/CnDR0FHRvEgCIxOyDPaKWvcerNpHjMMotfk/ENiZJE2rJLfhegQQbd+d+1Vptg== 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=JMfQxl2NN8hs/yzVU2LIW5wzRP3ULSd3N4Qjo/rjvhY=; b=Ol0z0/fIw9oNzruJyVQnLPUkV7NaslMUe89Ev66alexRkKrHAeb3QlollKWRdW2XkfLLoa+VzwFznWdMnTKxOPiX8L1G2JqLqibPGwlio5yoFzG0ZuAeaCpT4TQG4eCtMAXgzUpwT6nMvf02xoII1UcQe1H/mTGIoIjsydOyCTzuxCwFm+QUUHf691h8Dvj8Q99cG9DiRFG4lmTDwgZ+bVwi/BxB9peTGg8qlvhmdr47xSNhDfrXPqBc+1QAz6W3A2pJi9gp4rP3t8+xOoKhgdNLOmTJSUw9cSwIpueYSYJQafxrdjyHzS3pbj5oRhDBamOQyUpNX8z2ElD3fT2nrw== 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=JMfQxl2NN8hs/yzVU2LIW5wzRP3ULSd3N4Qjo/rjvhY=; b=otQOxOB/ha7ggzFgQLnkz8snS1RX+byKvabvXPLR8VT4g5YpBviBn2HdTjMla79mLWT+X16H/r3GZGYJ1ovP2TS1k3rUC5aL0GCxECPSo3Lt6eN0SBEPY1P/Kee7GOYTr986fURv8da1t2xHZt7PpJOH8tt8zJhiwLXSS7Le1Rw= 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 BN0PR13MB4567.namprd13.prod.outlook.com (2603:10b6:408:127::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.26; Fri, 17 Feb 2023 02:46:10 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::7ea4:e421:5dd5:9f4d]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::7ea4:e421:5dd5:9f4d%5]) with mapi id 15.20.6086.026; Fri, 17 Feb 2023 02:46:09 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 1/3] net/nfp: add the log source file Date: Fri, 17 Feb 2023 10:45:37 +0800 Message-Id: <20230217024539.16514-2-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.29.3 In-Reply-To: <20230217024539.16514-1-chaoyong.he@corigine.com> References: <20230217024539.16514-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SI2PR04CA0005.apcprd04.prod.outlook.com (2603:1096:4:197::16) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|BN0PR13MB4567:EE_ X-MS-Office365-Filtering-Correlation-Id: 4591a8ab-2e95-4a8d-93de-08db10911f9f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xVhSK1Mn7ky3hK5I4xvUVMVi9r6d9IXRcOF0ni1+ap5XApFqm0XIOXBBRxk2f37Qq1k61PYkH2Ov1i6OUrFNLpXqm2ORyBLMvN8Ghly5+89Qo9HgCei2RH2gTICqreUIcVgfQXcmTkJdC/11sbdD8zGm9Lr2D77VpIFLcRqGQ0luj7F3Zo0v2SFNjS/KrKMMLiZ940RY9YfT9PtEsb4XwgwQazsVCLB/brjm9VCTiG1WnR+LSjxrB+bqPT1gv99bj3eyUfpo64g7Lca8UtE4YgwLqVp1qKVS3o8ROtPObcXXkCX6XNIVo8ddpX8RtzQHOkCjj60r26FCBxW5Oa8Ng7aYbYqmGreAI+lr2bmKWM/R58rOGH6wOmVowaLf5xdoSxOqvXxuXcH5MT7gtJzND5F1LRNppwLsc8G+qfndeI4tZjlMmVoeDAJxGPpdNRcPa1fNZnb4KKVhDkJ8bQrGQsWzexmpu9kf/SGB7Y/7ffitfj069dfx2Qp4Es1iKyS6OqwsfIA/Fp77CN3PpDSEEopK8opToTvftE6hY0MoDaTN6xNHZa6jJrrkYQkoKXUQQNh3ZhFAGkwjQitfQjLzR2VapLs3CLcW2TbgTgaEr+9F1skCN+IRcDHwYrpJv8FfF3wzZ7HT5+c4ZGIw1qvWt58AJPocIC27e5jESceBzFMd/dssa/HYrsJhUgBzSWoQkHv15p7HhurhdQIzN6aNArnSrIxPbCDB3o+rTHU2wQyDSJzS/u2TQrjiI9zUbRXs 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)(376002)(39840400004)(366004)(396003)(136003)(346002)(451199018)(2616005)(107886003)(66574015)(36756003)(2906002)(86362001)(6916009)(66476007)(38100700002)(44832011)(41300700001)(5660300002)(66946007)(38350700002)(66556008)(8676002)(1076003)(6486002)(6512007)(83380400001)(478600001)(4326008)(52116002)(8936002)(26005)(6666004)(186003)(316002)(6506007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?kmakxzwrsvxn8BUtf+vhC4loysRK?= =?utf-8?q?n+rzBnwp1fMrgFZzEskolNCBjuHj6eNH7LWT/nyDnJhYgv20fKchgHh21mukjz6yK?= =?utf-8?q?6xXIijqmpiDDIFtHrNTwAuv2HW55houhrcPEm6yepwsRQQP4dPctHXnHK5TScUVnb?= =?utf-8?q?GHSKp0W0KXLsDyorpcX7xYvBmzTJjqrcC86SUnGbN0k9bFmIrr0h9yKMhSAOJoPoz?= =?utf-8?q?75cnO20mScl64xS2wivpz+kdA6/AynqJdEwbTMxqpkbxMcKDyWUjdZKyrw72BXD0H?= =?utf-8?q?VrTFY0InA+wcjXegiWsdQs1u0ueazLz5HlpI7OAXtYAMzbBMRcvpKNxMvk3SVCbsq?= =?utf-8?q?huscOArSXhedbfuez2IUEdmgAIE6wuOZSmoeNQQTiSq8MoqXRWHsOFMw8/MQWh9Au?= =?utf-8?q?C3+s/Ab1FdAPXFKBBCLEDmYUf8tAjAvISWxc+Zr8k0h/ez6DXxOcjyppwCoWMOSJi?= =?utf-8?q?gnnufX9Aq8MkofpJAixE1E+pdCLEyzGPkc5XLeP5YEzzW4+ab3OKOLBzg0eCEDzMG?= =?utf-8?q?41UagVlHR57Onb1Zu2RT332Mn+NMcFmiCR/ToB81J43ensSG6rihvLIqpIIp2oXVx?= =?utf-8?q?6h+U5D2m+LdXxghoMIU6cgkKQoGQe4gle2lYnW/HmVscmOJV6Sjl0QQAlcLFKMzna?= =?utf-8?q?LdrWL/9isW9Ikf1yam8wEcBlvgsoT/qsUim53YN8Xseuu4uvb+L5JAI0U17p0gWJQ?= =?utf-8?q?UZY+ab9YJkJUwPd/yCk+APJrISoG0YserZEtPvkXGxJ9tOK5yinDFNVKBGCreOqim?= =?utf-8?q?iphAITC4+DUL1q01KMvLQ+ylvSZBYlIRbYGIKbu6hpTWshk5jUwgevVoeIMWsBqor?= =?utf-8?q?wxVuiPEmehlE9alyjISdlTmTP3sZunqHJlloIospOx+5ppia7B/loyGC7u53hJawL?= =?utf-8?q?/FyrqZs/xPjRbydoHbFxLYA7xGsHk3b6VceYdRwfkTTJiCzTHzlr0WliPxTM6P6d1?= =?utf-8?q?gkwDO+5GtNJmES216iJGi7OgxyhrbyR2RdbHAZOUN5mX9gex8rqMPxUjoItFkluMb?= =?utf-8?q?3Tapcv39PYQltLTDhlcX3iyag+Ed5BfmmTzVE8gfAQ5ZtoY3dR88n8FVNrXNkRu4N?= =?utf-8?q?3E0Cb5GqCfsaDfvtJFJdsfFZZIwYNC+Bfjez6vdYWE7y/myVxT49/vjwY8pIYUbZh?= =?utf-8?q?ZWr+qggePu95ht8UAcjcwl5TSaFpwyLBcBrgUL7e2JCwHdLurUgCTo3jBRWqBH93D?= =?utf-8?q?OeQ6Ppuwotu1tNIiqGaGuO6lR4Xxv2NhSqmi2ityTBOZ5g1mpodccltHWOYll3abX?= =?utf-8?q?A5MpayrCCMmAqTBZuejqsTkGWeNu1xuwtIYdLpldHCQUVIQQ9ORV7+b8oUb+A09pD?= =?utf-8?q?m7DQNOQ6PvpI29yiUWSwR+yW8iqdp7COMUn4H1iU6JWJnWRDeowig/7jZvwQMK3hk?= =?utf-8?q?fKREVuT1SrYgz9BmM6UpeQuRV+qC5uj+7iqtvvD9E2b251rlhSdhe22ygs32wY5Cv?= =?utf-8?q?m2XLgKBLFrWiLVLRADBey8KldC3WDflFhHKC7f5CLdijh89t7NrDPXEOXrS7oDnhM?= =?utf-8?q?CF3EgLNlvRaXAaZnbXctra7ay1pbt9gEUQ=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4591a8ab-2e95-4a8d-93de-08db10911f9f X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2023 02:46:09.2723 (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: T0C7yqY3lBojQ1gQYUG99qrzyqmp/r9fXCeBlBf1IDdrLzarSVOHjcTNRCLrVb/JHHbg8lNqb/9gkEEv4nkIBGcDctu/hVQqpov35iGd0+Y= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR13MB4567 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 Prepare for adding more log functionality by moving the existing log functionality to its own file. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/meson.build | 1 + drivers/net/nfp/nfp_common.c | 3 --- drivers/net/nfp/nfp_logs.c | 10 ++++++++++ 3 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 drivers/net/nfp/nfp_logs.c diff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build index fc8fd906bc..b60eaed2b7 100644 --- a/drivers/net/nfp/meson.build +++ b/drivers/net/nfp/meson.build @@ -28,6 +28,7 @@ sources = files( 'nfp_ethdev_vf.c', 'nfp_ethdev.c', 'nfp_flow.c', + 'nfp_logs.c', 'nfp_mtr.c', ) diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c index c9401055d4..21737ff51d 100644 --- a/drivers/net/nfp/nfp_common.c +++ b/drivers/net/nfp/nfp_common.c @@ -1562,9 +1562,6 @@ nfp_net_set_vxlan_port(struct nfp_net_hw *hw, return ret; } -RTE_LOG_REGISTER_SUFFIX(nfp_logtype_init, init, NOTICE); -RTE_LOG_REGISTER_SUFFIX(nfp_logtype_driver, driver, NOTICE); -RTE_LOG_REGISTER_SUFFIX(nfp_logtype_cpp, cpp, NOTICE); /* * Local variables: * c-file-style: "Linux" diff --git a/drivers/net/nfp/nfp_logs.c b/drivers/net/nfp/nfp_logs.c new file mode 100644 index 0000000000..48c42fe53f --- /dev/null +++ b/drivers/net/nfp/nfp_logs.c @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2023 Corigine, Inc. + * All rights reserved. + */ + +#include "nfp_logs.h" + +RTE_LOG_REGISTER_SUFFIX(nfp_logtype_init, init, NOTICE); +RTE_LOG_REGISTER_SUFFIX(nfp_logtype_driver, driver, NOTICE); +RTE_LOG_REGISTER_SUFFIX(nfp_logtype_cpp, cpp, NOTICE); From patchwork Fri Feb 17 02:45:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 124099 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 06FC841CB7; Fri, 17 Feb 2023 03:46:28 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 48D2642BD9; Fri, 17 Feb 2023 03:46:17 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2097.outbound.protection.outlook.com [40.107.220.97]) by mails.dpdk.org (Postfix) with ESMTP id EEA5440A8B for ; Fri, 17 Feb 2023 03:46:12 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QBLaRAx2600gpYNiNu2rhAPLLkGwQj0J4I6jVpjOAm7XcG8XFaF24lAVhTNPzpPIYloZ/G85aiWo/7QnExRvonNE+oDvS4iDRd91RmpYNrtxiXsd4VOHTAZB+ZvzMLiK975RbKj+BPg5ibYla1pEAgyxXFJLQpm9X6eNK/qbgQKo3oqLBXXX05TGY9WIXCN4/oirsQ1u+NO9v93T/7F6iE5ufuTQm+g33FulSj0AtE8Z5y4WLEir42tI1PrJRZ07Wb4mcpJ+DcMzcOe7IMudyqvEVOPVrWRXu9Ap/yNtisuy/Wu2qv021+MJym6KW9KMHQFwZD12Uff3VtUnLfFANg== 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=bhidpfAq+oVnz/8GbotcbTD8VIKzK7KtTY5JtfI/ckQ=; b=cHbO/9b8qwOhmDJL3WnbkvekIdHWcnFtAimHZ4AqgYMBbhtSQHhehCT9UVevJpZ0pvvDBztDHqEdSwpPoGBZ93J8+Qx1pdE7ymTcBdcmsc83gkT31UI+ceG/CT1X3GLtBvDJeCkeDPqNz/d66ns4WFqUvFmlMPf4ydUCu+NUQzZOtgigCyYANs8E6EDxX9YXRluDJtPuxiQlkDOS3CYkeNURzMMnFwTcJtZHJ3d7x7WxM9iQlyyLacOw1Z1CFbb96Kh7d26UAO/KKb7RfRKHsE/aong6MHbt6GtqVgMJuT9uKdhwFjkomyH3wBBII4C+t2MJTWRY5lvhHiqNWZsuFQ== 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=bhidpfAq+oVnz/8GbotcbTD8VIKzK7KtTY5JtfI/ckQ=; b=DXP5JYDqpe7mCrQS+ylIz9d/W/sTJJl/Hv0zMnSIZsfIEIo0mJr2vHHmmU3wF0s9RTpMr7dkOeQt4SPg8qZrGYrYcs/kkTIvahywXcPmYPk68VmTMKn/dwmKQ5skAuPfYMJ6SovV1bVzrqZvnqRpiVEhiTEmLTiXvNBd2OFez0k= 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 BN0PR13MB4567.namprd13.prod.outlook.com (2603:10b6:408:127::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.26; Fri, 17 Feb 2023 02:46:11 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::7ea4:e421:5dd5:9f4d]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::7ea4:e421:5dd5:9f4d%5]) with mapi id 15.20.6086.026; Fri, 17 Feb 2023 02:46:11 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 2/3] net/nfp: get rid of the usage of RTE log level type Date: Fri, 17 Feb 2023 10:45:38 +0800 Message-Id: <20230217024539.16514-3-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.29.3 In-Reply-To: <20230217024539.16514-1-chaoyong.he@corigine.com> References: <20230217024539.16514-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SI2PR04CA0005.apcprd04.prod.outlook.com (2603:1096:4:197::16) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|BN0PR13MB4567:EE_ X-MS-Office365-Filtering-Correlation-Id: efa80192-fe3a-4f20-1d48-08db109120df X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OtgW0qiue6FNf93kCpJjstNWO+cX4Vbd9zg5++iZipfNUFNERj/NzPASKEDLzGdhKJ+5mHB0rgqhaAzZBtipryYBjtvn2KRTtt0Ky/O3gRt8Xv/CwemdvRpgd2yCiH9yBXKfHkcgMPgca7SiIKvsq5Jr8I2kM4S14Q2/OxFwHd3rCS3iduqpXHbqsfye6FAni9rdYXwbDXbFbF+C97oh0FoYWmzO17nqCvcWmH9uxfUCsemVlvosbrEs/tkwm6xu1Jmn2dDUixBafeTcRFvGe2Bw/hR4fiL+Q1naSbKtWOj9OCGWx+ccg84uTLuRHLYVIkw8hkfkx3E7+DIk0OT0C2w3wpJtlrULkIeZUG+t8ri7MliqlL03TlQ7CkX8pDnLSgaMoWmSk+laPXpTxhnvj5n2ApLfjQjtyO3W4qeRDnDJWVl5H0Ev6HwPtz3Y4ectyASdKt/GOEUGLmpRyO4U8uS0gRuUc77DsBRMZ7JwZHpsRol/LQSMpb2Ao3ogeW1DK2oGYuZmyB2twoMsRIXs2ykUxR1MLpr7qBUO7MbwYgFgK5+5GNtvSbMNEQkSkHB4RjqVV897K5YTAd1ZtzWDrMuYj6WXT/uMP3iJlclR/NyRrbFEJM7JIz9kAiGs0RfxK/maFkP582RcGTiPGWs4r3IzcfDtkKHScHV7xZJxVm0RitKrDr3Bst9fvDDUGF/TSzYqZ1IigACreIAoDN/JXpgIKvGs3zO2fxWM7rcXeUe2rw7ojTYWPcy6YHNABqaAZy528UPx3gDJ/X/wG3GAAQ== 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)(376002)(39840400004)(366004)(396003)(136003)(346002)(451199018)(2616005)(107886003)(66574015)(36756003)(2906002)(86362001)(6916009)(66476007)(38100700002)(44832011)(41300700001)(5660300002)(66946007)(38350700002)(66556008)(8676002)(1076003)(6486002)(6512007)(83380400001)(478600001)(4326008)(52116002)(8936002)(26005)(6666004)(186003)(316002)(6506007)(26583001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?1hqp8REnFybd5/v26/nyJ5SCN5dI?= =?utf-8?q?zf2xc9DPvlD3n8gHkbPdApm4OuROvfGP7V4HLnzVDyIecxW1owdVw0EKmpiZmbxd3?= =?utf-8?q?rETxdxcVXfFb6vDdSfMBVSXff1M+AdvMOGsyOP9DYtgDgnMuoT9QyxDJ/febHhDBo?= =?utf-8?q?sh9gP5LbQ2qnufodanSLEWQ6HVWcxYp4udWX48EKEOPcT8VDVV5M7bOmFKJ82LeM+?= =?utf-8?q?brgwy6ae+2ilyMCdPKzWx54bkFg2ViGvORMvxWhsGzIrTT75Px3DY0vGzQQ1uHwyO?= =?utf-8?q?HyAVBrcAdeNKQO2ZwSSsY0Sp0JkTDnqNrJPimSFF2kB9qc5G8TEk4OWt7KSSZu9df?= =?utf-8?q?2fqb2JhRfLu2ykGSWuvhd7ogUBW1Z+mRS52hVfj7Q+1/Gw1THTDoXOGbUh7Ma+2rT?= =?utf-8?q?H1l0z1CTthev/p6vhX03X+DPcsWUaW8IFPwTrhsMTdpxFT++l2e4s1lqy/oU+Yo0T?= =?utf-8?q?I8h5OAU+2JZQmUL8hnVONVYqTA0CIBUgRj8PeTquA4rAybvZDnD7LqyFjvx9PreHN?= =?utf-8?q?TJ1sHewXuqZoSAJZg0r6WMCuIuVZLGbZ7pcLhIj3qiIOPq5lco9iy2NLy7BV3uqtn?= =?utf-8?q?Bek1fYJlMvEO4c5+wNSyhn9GiDPdtSwBBaPTBNTQaZhd6SNWFl1yLfFkROsz7uXN9?= =?utf-8?q?cIYcRj69x0j9K6UPBsVjt1il3DgWv8KgGDq35FW+i9tSHizQshJDZK5HA9yrzp6uN?= =?utf-8?q?U66AoAhWNvt8PqWqgKrnmAchSjjpWwYV7JnzFLiIP+1rltp8Q/xcolmcXal838an9?= =?utf-8?q?67A8SgK6vR/4WfTopMEkTW+YCSosLEsssJQ4LkeLHzMmEF5P6o7tL7xNehkSOJnVM?= =?utf-8?q?wCJVbtqpgR1RZrPLWd+8XJaxNtsQZFow39XV/9eCGgsqSpmHVAZ3YPVCR/5p7TkEw?= =?utf-8?q?lvYQNqCPJbvHGyeH94KRJ6x5W5T7UwxFTeA2rkrvghHdLDrUw5835dg7VDV/Bp4eB?= =?utf-8?q?4zu2LLCaUVQVXN+9KoI/JwyhByyCr8tWR0RGYGpJNN+cmDTas9uSiOqC6yomqHhQW?= =?utf-8?q?o76xqYFTAELYXkMLk9RzJIZ5Hm7MU7zv/J6d1jD9FYEArxzANxuQQB7U9Phvt0+FI?= =?utf-8?q?ZVREe+Gsr6FkbhYFVWVNjF/uEg6wvMqwr1ADpkNPE93Zi50rrrPMj9AzSGVY6WSaD?= =?utf-8?q?s5mnfTG5ptEVzdVbkQAtFmZAkDpSJFwP0Bip+YPrshUI7zV2sVY6sJ3yyhwOxMFol?= =?utf-8?q?00QkaHw00li1pwiXEXPWfkfPRevfeOiToPmlf/KonOqMA5OQ9NZV0VkM0IXzKfFBW?= =?utf-8?q?yKiZRnh4bI2KhAu2l1fnbGw4XWQaOOX9MrD4+YU325K/IiVlZkVTXmXxm43IpRsMX?= =?utf-8?q?zTcPvNSQxH4+2yD+Ksd6quqgU8qnrCpsMX51OrMkGY5yI3TyiLyKkWAl/0o2oaejX?= =?utf-8?q?a0lySySRhph3HGJMGwdOzcITYZFvfayPmwFY4zodMITSNhrfHvg7UDgff6Jqgr8C4?= =?utf-8?q?c7wM9+GK2SmqHg/lVjXOnVVuBBYDHge9aC+oEEhtpzNWiz4ciKqJAsLgT1lGErKnQ?= =?utf-8?q?C+4O5r0tMrL84tOXUYv4VFzjHnB5vlKFjw=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: efa80192-fe3a-4f20-1d48-08db109120df X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2023 02:46:11.3195 (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: HPiBdGGRrU57hGTFfHhqAYopkX9ixmJ9eVfpi4Dx2sVHFCHvHHYXu9UEgowhD4BuxOGhoxGXrZZh5hkG7Z+ye3tQTsKbvIv2jmsSL7v8Dq8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR13MB4567 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 Register the own RX/TX debug log level type, and get rid of the usage of RTE_LOGTYPE_*. Then we can control the log by a independent switch. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfp_logs.c | 10 ++++++++++ drivers/net/nfp/nfp_logs.h | 8 ++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/nfp_logs.c b/drivers/net/nfp/nfp_logs.c index 48c42fe53f..cd58bcee43 100644 --- a/drivers/net/nfp/nfp_logs.c +++ b/drivers/net/nfp/nfp_logs.c @@ -5,6 +5,16 @@ #include "nfp_logs.h" +#include + RTE_LOG_REGISTER_SUFFIX(nfp_logtype_init, init, NOTICE); RTE_LOG_REGISTER_SUFFIX(nfp_logtype_driver, driver, NOTICE); RTE_LOG_REGISTER_SUFFIX(nfp_logtype_cpp, cpp, NOTICE); + +#ifdef RTE_ETHDEV_DEBUG_RX +RTE_LOG_REGISTER_SUFFIX(nfp_logtype_rx, rx, DEBUG) +#endif + +#ifdef RTE_ETHDEV_DEBUG_TX +RTE_LOG_REGISTER_SUFFIX(nfp_logtype_tx, tx, DEBUG) +#endif diff --git a/drivers/net/nfp/nfp_logs.h b/drivers/net/nfp/nfp_logs.h index b7632ee72c..315a57811c 100644 --- a/drivers/net/nfp/nfp_logs.h +++ b/drivers/net/nfp/nfp_logs.h @@ -15,15 +15,19 @@ extern int nfp_logtype_init; #define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>") #ifdef RTE_ETHDEV_DEBUG_RX +extern int nfp_logtype_rx; #define PMD_RX_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s() rx: " fmt "\n", __func__, ## args) + rte_log(RTE_LOG_ ## level, nfp_logtype_rx, \ + "%s(): " fmt "\n", __func__, ## args) #else #define PMD_RX_LOG(level, fmt, args...) do { } while (0) #endif #ifdef RTE_ETHDEV_DEBUG_TX +extern int nfp_logtype_tx; #define PMD_TX_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s() tx: " fmt "\n", __func__, ## args) + rte_log(RTE_LOG_ ## level, nfp_logtype_tx, \ + "%s(): " fmt "\n", __func__, ## args) #else #define PMD_TX_LOG(level, fmt, args...) do { } while (0) #endif From patchwork Fri Feb 17 02:45:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 124100 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 E5E8141CB7; Fri, 17 Feb 2023 03:46:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 539F442C76; Fri, 17 Feb 2023 03:46:18 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2108.outbound.protection.outlook.com [40.107.220.108]) by mails.dpdk.org (Postfix) with ESMTP id 8AA504113F for ; Fri, 17 Feb 2023 03:46:15 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iTe/gEgKtMHBWlQqWtmYhe+fpr5bi5xQqBdjv6noXcGvpRLSWVZ4hePq/FXGfDPY7I12Yr29jVWuVawzEQVqwQr1jbSgYMcsmUERRzfyllLUv12bbj/iPFGQqrsrnKPm0IzmKvWbz1XhSbAWqNBqqkIBvGiBHt99SDxrKIVY3/qsypnS7B+x9NX6dNvP9GmFKsEOKgypetejNkbxUbSRpDN52mWxNHpCIxkwBMMV6AQiEvtJ8cznvfkWIk+fE50S/HTZdGchHLuf8UeB6pkt3gC2WErGUCeiOokWwkHbmYrSEYhg12fYTqIbpDXdC1snCJLBZSBsC4bQ8v9Qezw9Dw== 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=xuvTX+OIVcMsxNFH2cbPIMoMuWioVh/uxTL8X946T7o=; b=Oa47DMTW4b1bu37o9ZeBcaTuReXn4hIaQsLEgV/KHfgE/ja2FP7lg5JfTQTX7NtFG4mB4QYcXSMfHYK6ykASzoEm+g4Dr1LtsAlXctm8FQ7/VqspTYPLeIdKmGb4dLW/xNJFXtBQjjzQybCNe4thDTU+PWfpVnz4h4PxisyVzCRz2yElgVTuqj1OECWbB+YiONrd3t6n3c20eCZpl8ttnSUckuY76gn4m4xJFT0dLKhAB/Ce6iqtgytby3mK4q6/8K6bmSL1IET750p/fgz5HH8YA17kjWcijBS+NSCGuk4gFSD83WqWEmHpzRpwsju7Ba8imsCflJy+EqGASBdGsw== 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=xuvTX+OIVcMsxNFH2cbPIMoMuWioVh/uxTL8X946T7o=; b=kaLOn3k2LWrGSYkY7g4oRm1vgpp05GZcjH261gDg+2NHwV/GBZ4XajaLJVAC+VQMyHzhksudMKx+N/cybnIzRLrq2nlC5SGGirnp9kQolp/2qRccYhJAgyPCNE1qyYmhnRuYRtb5mXO+dsvl2fKba/RBcX3V8ADquMPSUNoQWbY= 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 BN0PR13MB4567.namprd13.prod.outlook.com (2603:10b6:408:127::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.26; Fri, 17 Feb 2023 02:46:13 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::7ea4:e421:5dd5:9f4d]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::7ea4:e421:5dd5:9f4d%5]) with mapi id 15.20.6086.026; Fri, 17 Feb 2023 02:46:13 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 3/3] net/nfp: get rid of the usage of RTE log macro Date: Fri, 17 Feb 2023 10:45:39 +0800 Message-Id: <20230217024539.16514-4-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.29.3 In-Reply-To: <20230217024539.16514-1-chaoyong.he@corigine.com> References: <20230217024539.16514-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SI2PR04CA0005.apcprd04.prod.outlook.com (2603:1096:4:197::16) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|BN0PR13MB4567:EE_ X-MS-Office365-Filtering-Correlation-Id: 7da7d8ae-4de2-4a7d-d2b7-08db10912212 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: r4w8J3+JN0s6UZ5CBj955KG7/wxq/dbcFTjAUH9CAMKqLR3bxR7Fh9a/80nCsBHqPnilaGRoAF1XpLDFAizX5eHUqPr3sGIHYPUqrBffnII5PmIsnhH+i4rYjLBo4F37F2UDLH7wLHWUFXr6gM4qbwF8HWrr4KR9sKd4FsWvuMXkmXI8LqyMZhSgRKssClDK4kzbzMF45YxhHYKj0YXrrAFHNw2aOb2aULEujHaucYcyRVH+gKbjiD8I4A+7/skbDgTAgNLNBpGvKQF6a8m8BgTsAPyFuCaVcfz4TegV+1Koa5M6QeXd4u50HCE9i8j2l6Kvie+unHnqwE6AZrXwCF1Eegq7YK9cnB6SBExASQ5UF+0uz/p9FvqG1/JzqEjku3yxCHFHIF4dknxdGq0NR6960GHo6N4iHOSsTzUipkeojhGqeOamwx0IE0zH5pK65zBblRUvn97vpfE6dKGXZz0q5VI2h77cUHl57kwljIRkGPX8kUcunHy7jajceHLZyD4sKbVd/HHQmtN4PJ1gIhIUHIu3plcWPap+xxq1jch3+Ri1xzqOmN3zsOkReO8UBhRJJYmKCqMW7t/+W8dkh57QXc7B2Hiyy4IYlrM8FSLcYF46lU7HDPR8zGm3FxK3t3mYdeK/j1743WDnIgJyfZZpHkcU0P6bnq9fln9DxFkA2yAy8uhYwuBTwHo/RCXp5p04niccKm46UlqWhgDfNml/lN5k+Y47QhyTBCRnD36eUv5/GcfhvDO85IxtiImhzUXaSlLR/neErgIvMgE2Wg== 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)(376002)(39840400004)(366004)(396003)(136003)(346002)(451199018)(2616005)(107886003)(66574015)(36756003)(2906002)(86362001)(6916009)(66476007)(38100700002)(44832011)(41300700001)(30864003)(5660300002)(66946007)(38350700002)(66556008)(8676002)(1076003)(6486002)(6512007)(83380400001)(478600001)(4326008)(52116002)(8936002)(26005)(6666004)(186003)(316002)(6506007)(26583001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?zAi6tuL+YehB7JNSlUDwRU8N8Fqx?= =?utf-8?q?gHadhpJwlWKh4uyXsrSyoOkwC+CeaCCMmkZTWsEix18wuYPnOSu5pJos0Ysk6YnGp?= =?utf-8?q?og5Ky5KQqSkSvO7v7i9JVWGw2XMkw5Ac5FSFA0Fnqqkl61LdvIDN5jdeVDzBdTGIN?= =?utf-8?q?Waev8z6ByxGnW9MQCKDFjPsacmeQpDP/ZRIrEF47iQ+bK7X1uNvKT62woL/gkY1M8?= =?utf-8?q?McPBElRyj0QhE8937lYjry2uESBdZ9g//qPBaHoa/v+bMFbuCWxts04hoABHs86wE?= =?utf-8?q?FcIkU1poPRQa6iACL0Uvgtnny5osdD8eXaI7OsAWwj2E6lGn8SKdrmMZY75DSI9u9?= =?utf-8?q?GeSWYwboHAZ2Wbzv4qJi1X5GVrWxIali4GXvkiHkhb+6i5wzdvFxETwPLcarsi4pl?= =?utf-8?q?S6g0TqQ2svy658u45FScwvp3cy/Xb0iLK3nTFhemgxjyu0XgnQzN2LbSznQvIF2mE?= =?utf-8?q?SeRWHotzEaRosRgf04F5i/DukgNLY/CO3NoqeMFyINvuseEo8pV23XR8K1lzYt36x?= =?utf-8?q?tGDhQd6/r0P0ppbrdAziatlYT9CQQRY0/Qi1AuWvgygyKoBCn93o1ov68kKUGFtFo?= =?utf-8?q?5ntjAoaGbkoWO5LqYhZUGx/3b0Jl3MnDYJufMihGclI9ixz7NKBP8hq+GDwlh3SaK?= =?utf-8?q?BcHfSACF/Pq9kFJOgvIfTPZ/etEaZMKFYr2DEjgvw+iM1kPJLeL10YkV47XzMLIkf?= =?utf-8?q?67u3A5uRoYmADJRWdFuOZfG5n34ht4D/wLtgD12KHY03/puDuVLD2kzHlpBEqFIi9?= =?utf-8?q?Lih7OmABk1ZwIcMxgKt4DGiHb/oiO3+g7s3EFtffDyCtfBsRzetC4/70wbwIMYAE0?= =?utf-8?q?BA10AdoiMZDR5+dQoKf6vWvZXMGQht9HqzFDCbMHibkr1KEBG2y031lAJgRcWUBTd?= =?utf-8?q?vMv/67PugFjnqOipwJW+VYrHkaWSHoSNtyXm8jXIlp8jCXKa53VBWAuWs43oxo9IZ?= =?utf-8?q?+H36cbpUHZpURanL5Tq5zJpXFogsO8Z5NRrmE+ygTLMsHZb/bW6qyLiFNrddn8BRZ?= =?utf-8?q?dVUzEhNVHm2psC9SZJ2nFzyZd4flMWExqWSfZ/A0+7cVStE6P3uc/0ae1BE4N1Er6?= =?utf-8?q?CYdcCFZ1qcwlts6n9iMI7OdM50tBBqBl3h6O5wIzevydOXfPZUVMQTwLDDCUHbMEu?= =?utf-8?q?fZpIclqHPHE9X+r3TuBV8UZdLPUhp7z2StvXsvJ0xNx+xxFlhCKusS4uCWB1WmDFo?= =?utf-8?q?+BRdX1xtJ9Z99Rt0wPSuSs1rpTwnpMeV7Rom0Qlho2Oyw0MN3GFPOOuQdALT7nlGd?= =?utf-8?q?BhxxPipWH26gpIoUywXYLWYNhKIIETo+exvujaCnp4jntw9nOl9xZ6IYNrduihQnf?= =?utf-8?q?b00cKPO0tCZ5eEJa11legjvAMbMJVE0N25+ZroYQuBAt6u0BZOSj/MXuy13GNaQG4?= =?utf-8?q?eDYc9ByY30JxsS13iQTqTAPTRZwFETwrbmeB3HYU9P6SYnBO6HZaE9Eju7nFJie5J?= =?utf-8?q?OlFDAhH1kxZtBnnikE+YAWIrd+UabQWD3cBXoTcllLPu8flLRR12q5peTn9mQcPd9?= =?utf-8?q?Db1pOME35U8JMRKcQj4YwwP2iU0xwRZzgQ=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7da7d8ae-4de2-4a7d-d2b7-08db10912212 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2023 02:46:13.4925 (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: dsCjgA/orLgwIUgr2p2leqhYbLQ5nfmmn2Dsj/fWDGEMxpM7spEWcmn1M98aY0Apqkh6e5wo/15mvSEVO5KlYQ/6S/k3QfMKq497pyrPhR4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR13MB4567 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 Replace the usage of RTE_LOG* macro with PMD specific logging. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/flower/nfp_flower.c | 10 ++--- drivers/net/nfp/flower/nfp_flower_ctrl.c | 2 +- drivers/net/nfp/nfp_cpp_bridge.c | 48 ++++++++++------------ drivers/net/nfp/nfp_ethdev.c | 4 +- drivers/net/nfp/nfp_ethdev_vf.c | 4 +- drivers/net/nfp/nfp_rxtx.c | 10 ++--- drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c | 1 + 7 files changed, 38 insertions(+), 41 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index f1424a010d..42014295ab 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -330,7 +330,7 @@ nfp_flower_pf_recv_pkts(void *rx_queue, * DPDK just checks the queue is lower than max queues * enabled. But the queue needs to be configured */ - RTE_LOG_DP(ERR, PMD, "RX Bad queue\n"); + PMD_RX_LOG(ERR, "RX Bad queue"); return 0; } @@ -343,7 +343,7 @@ nfp_flower_pf_recv_pkts(void *rx_queue, while (avail + avail_multiplexed < nb_pkts) { rxb = &rxq->rxbufs[rxq->rd_p]; if (unlikely(rxb == NULL)) { - RTE_LOG_DP(ERR, PMD, "rxb does not exist!\n"); + PMD_RX_LOG(ERR, "rxb does not exist!"); break; } @@ -363,8 +363,8 @@ nfp_flower_pf_recv_pkts(void *rx_queue, */ new_mb = rte_pktmbuf_alloc(rxq->mem_pool); if (unlikely(new_mb == NULL)) { - RTE_LOG_DP(DEBUG, PMD, - "RX mbuf alloc failed port_id=%u queue_id=%d\n", + PMD_RX_LOG(DEBUG, + "RX mbuf alloc failed port_id=%u queue_id=%d", rxq->port_id, rxq->qidx); nfp_net_mbuf_alloc_failed(rxq); break; @@ -391,7 +391,7 @@ nfp_flower_pf_recv_pkts(void *rx_queue, * responsibility of avoiding it. But we have * to give some info about the error */ - RTE_LOG_DP(ERR, PMD, + PMD_RX_LOG(ERR, "mbuf overflow likely due to the RX offset.\n" "\t\tYour mbuf size should have extra space for" " RX offset=%u bytes.\n" diff --git a/drivers/net/nfp/flower/nfp_flower_ctrl.c b/drivers/net/nfp/flower/nfp_flower_ctrl.c index 03a2e2e622..6e7545bc39 100644 --- a/drivers/net/nfp/flower/nfp_flower_ctrl.c +++ b/drivers/net/nfp/flower/nfp_flower_ctrl.c @@ -91,7 +91,7 @@ nfp_flower_ctrl_vnic_recv(void *rx_queue, * responsibility of avoiding it. But we have * to give some info about the error */ - RTE_LOG_DP(ERR, PMD, + PMD_RX_LOG(ERR, "mbuf overflow likely due to the RX offset.\n" "\t\tYour mbuf size should have extra space for" " RX offset=%u bytes.\n" diff --git a/drivers/net/nfp/nfp_cpp_bridge.c b/drivers/net/nfp/nfp_cpp_bridge.c index 4aa36eb581..8e29cfb6d3 100644 --- a/drivers/net/nfp/nfp_cpp_bridge.c +++ b/drivers/net/nfp/nfp_cpp_bridge.c @@ -162,14 +162,14 @@ nfp_cpp_bridge_serve_write(int sockfd, struct nfp_cpp *cpp) area = nfp_cpp_area_alloc_with_name(cpp, cpp_id, "nfp.cdev", nfp_offset, curlen); if (area == NULL) { - RTE_LOG(ERR, PMD, "%s: area alloc fail\n", __func__); + PMD_CPP_LOG(ERR, "area alloc fail"); return -EIO; } /* mapping the target */ err = nfp_cpp_area_acquire(area); if (err < 0) { - RTE_LOG(ERR, PMD, "area acquire failed\n"); + PMD_CPP_LOG(ERR, "area acquire failed"); nfp_cpp_area_free(area); return -EIO; } @@ -183,16 +183,16 @@ nfp_cpp_bridge_serve_write(int sockfd, struct nfp_cpp *cpp) len, count); err = recv(sockfd, tmpbuf, len, MSG_WAITALL); if (err != (int)len) { - RTE_LOG(ERR, PMD, - "%s: error when receiving, %d of %zu\n", - __func__, err, count); + PMD_CPP_LOG(ERR, + "error when receiving, %d of %zu", + err, count); nfp_cpp_area_release(area); nfp_cpp_area_free(area); return -EIO; } err = nfp_cpp_area_write(area, pos, tmpbuf, len); if (err < 0) { - RTE_LOG(ERR, PMD, "nfp_cpp_area_write error\n"); + PMD_CPP_LOG(ERR, "nfp_cpp_area_write error"); nfp_cpp_area_release(area); nfp_cpp_area_free(area); return -EIO; @@ -262,13 +262,13 @@ nfp_cpp_bridge_serve_read(int sockfd, struct nfp_cpp *cpp) area = nfp_cpp_area_alloc_with_name(cpp, cpp_id, "nfp.cdev", nfp_offset, curlen); if (area == NULL) { - RTE_LOG(ERR, PMD, "%s: area alloc failed\n", __func__); + PMD_CPP_LOG(ERR, "area alloc failed"); return -EIO; } err = nfp_cpp_area_acquire(area); if (err < 0) { - RTE_LOG(ERR, PMD, "area acquire failed\n"); + PMD_CPP_LOG(ERR, "area acquire failed"); nfp_cpp_area_free(area); return -EIO; } @@ -280,7 +280,7 @@ nfp_cpp_bridge_serve_read(int sockfd, struct nfp_cpp *cpp) err = nfp_cpp_area_read(area, pos, tmpbuf, len); if (err < 0) { - RTE_LOG(ERR, PMD, "nfp_cpp_area_read error\n"); + PMD_CPP_LOG(ERR, "nfp_cpp_area_read error"); nfp_cpp_area_release(area); nfp_cpp_area_free(area); return -EIO; @@ -290,9 +290,9 @@ nfp_cpp_bridge_serve_read(int sockfd, struct nfp_cpp *cpp) err = send(sockfd, tmpbuf, len, 0); if (err != (int)len) { - RTE_LOG(ERR, PMD, - "%s: error when sending: %d of %zu\n", - __func__, err, count); + PMD_CPP_LOG(ERR, + "error when sending: %d of %zu", + err, count); nfp_cpp_area_release(area); nfp_cpp_area_free(area); return -EIO; @@ -325,19 +325,19 @@ nfp_cpp_bridge_serve_ioctl(int sockfd, struct nfp_cpp *cpp) /* Reading now the IOCTL command */ err = recv(sockfd, &cmd, 4, 0); if (err != 4) { - RTE_LOG(ERR, PMD, "%s: read error from socket\n", __func__); + PMD_CPP_LOG(ERR, "read error from socket"); return -EIO; } /* Only supporting NFP_IOCTL_CPP_IDENTIFICATION */ if (cmd != NFP_IOCTL_CPP_IDENTIFICATION) { - RTE_LOG(ERR, PMD, "%s: unknown cmd %d\n", __func__, cmd); + PMD_CPP_LOG(ERR, "unknown cmd %d", cmd); return -EINVAL; } err = recv(sockfd, &ident_size, 4, 0); if (err != 4) { - RTE_LOG(ERR, PMD, "%s: read error from socket\n", __func__); + PMD_CPP_LOG(ERR, "read error from socket"); return -EIO; } @@ -347,7 +347,7 @@ nfp_cpp_bridge_serve_ioctl(int sockfd, struct nfp_cpp *cpp) err = send(sockfd, &tmp, 4, 0); if (err != 4) { - RTE_LOG(ERR, PMD, "%s: error writing to socket\n", __func__); + PMD_CPP_LOG(ERR, "error writing to socket"); return -EIO; } @@ -357,7 +357,7 @@ nfp_cpp_bridge_serve_ioctl(int sockfd, struct nfp_cpp *cpp) err = send(sockfd, &tmp, 4, 0); if (err != 4) { - RTE_LOG(ERR, PMD, "%s: error writing to socket\n", __func__); + PMD_CPP_LOG(ERR, "error writing to socket"); return -EIO; } @@ -384,8 +384,7 @@ nfp_cpp_bridge_service_func(void *args) unlink("/tmp/nfp_cpp"); sockfd = socket(AF_UNIX, SOCK_STREAM, 0); if (sockfd < 0) { - RTE_LOG(ERR, PMD, "%s: socket creation error. Service failed\n", - __func__); + PMD_CPP_LOG(ERR, "socket creation error. Service failed"); return -EIO; } @@ -399,16 +398,14 @@ nfp_cpp_bridge_service_func(void *args) ret = bind(sockfd, (const struct sockaddr *)&address, sizeof(struct sockaddr)); if (ret < 0) { - RTE_LOG(ERR, PMD, "%s: bind error (%d). Service failed\n", - __func__, errno); + PMD_CPP_LOG(ERR, "bind error (%d). Service failed", errno); close(sockfd); return ret; } ret = listen(sockfd, 20); if (ret < 0) { - RTE_LOG(ERR, PMD, "%s: listen error(%d). Service failed\n", - __func__, errno); + PMD_CPP_LOG(ERR, "listen error(%d). Service failed", errno); close(sockfd); return ret; } @@ -421,9 +418,8 @@ nfp_cpp_bridge_service_func(void *args) if (errno == EAGAIN || errno == EWOULDBLOCK) continue; - RTE_LOG(ERR, PMD, "%s: accept call error (%d)\n", - __func__, errno); - RTE_LOG(ERR, PMD, "%s: service failed\n", __func__); + PMD_CPP_LOG(ERR, "accept call error (%d)", errno); + PMD_CPP_LOG(ERR, "service failed"); close(sockfd); return -EIO; } diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index f05c50ac88..139f3090aa 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -519,8 +519,8 @@ nfp_net_init(struct rte_eth_dev *eth_dev) /* NFP can not handle DMA addresses requiring more than 40 bits */ if (rte_mem_check_dma_mask(40)) { - RTE_LOG(ERR, PMD, - "device %s can not be used: restricted dma mask to 40 bits!\n", + PMD_INIT_LOG(ERR, + "device %s can not be used: restricted dma mask to 40 bits!", pci_dev->device.name); return -ENODEV; } diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c index 07a2e17ef8..cbe5c5c5c8 100644 --- a/drivers/net/nfp/nfp_ethdev_vf.c +++ b/drivers/net/nfp/nfp_ethdev_vf.c @@ -293,8 +293,8 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev) /* NFP can not handle DMA addresses requiring more than 40 bits */ if (rte_mem_check_dma_mask(40)) { - RTE_LOG(ERR, PMD, - "device %s can not be used: restricted dma mask to 40 bits!\n", + PMD_INIT_LOG(ERR, + "device %s can not be used: restricted dma mask to 40 bits!", pci_dev->device.name); return -ENODEV; } diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index 79a66b6e44..09cc24741a 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -353,7 +353,7 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) * DPDK just checks the queue is lower than max queues * enabled. But the queue needs to be configured */ - RTE_LOG_DP(ERR, PMD, "RX Bad queue\n"); + PMD_RX_LOG(ERR, "RX Bad queue"); return avail; } @@ -363,7 +363,7 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) while (avail < nb_pkts) { rxb = &rxq->rxbufs[rxq->rd_p]; if (unlikely(rxb == NULL)) { - RTE_LOG_DP(ERR, PMD, "rxb does not exist!\n"); + PMD_RX_LOG(ERR, "rxb does not exist!"); break; } @@ -383,8 +383,8 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) */ new_mb = rte_pktmbuf_alloc(rxq->mem_pool); if (unlikely(new_mb == NULL)) { - RTE_LOG_DP(DEBUG, PMD, - "RX mbuf alloc failed port_id=%u queue_id=%u\n", + PMD_RX_LOG(DEBUG, + "RX mbuf alloc failed port_id=%u queue_id=%u", rxq->port_id, (unsigned int)rxq->qidx); nfp_net_mbuf_alloc_failed(rxq); break; @@ -412,7 +412,7 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) * responsibility of avoiding it. But we have * to give some info about the error */ - RTE_LOG_DP(ERR, PMD, + PMD_RX_LOG(ERR, "mbuf overflow likely due to the RX offset.\n" "\t\tYour mbuf size should have extra space for" " RX offset=%u bytes.\n" diff --git a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c index d8d1293166..6029bd6c3a 100644 --- a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c +++ b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c @@ -36,6 +36,7 @@ #include "nfp_logs.h" #include "nfp_target.h" #include "nfp6000/nfp6000.h" +#include "../nfp_logs.h" #define NFP_PCIE_BAR(_pf) (0x30000 + ((_pf) & 7) * 0xc0)