From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <dev-bounces@dpdk.org> Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0A9D2423B5; Thu, 12 Jan 2023 12:27:11 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F347742D22; Thu, 12 Jan 2023 12:27:10 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 02EA640E25 for <dev@dpdk.org>; Thu, 12 Jan 2023 12:27:08 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30C9dqFN021078; Thu, 12 Jan 2023 03:24:51 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=IZLUMH46ygjVzc6J7Rhv7OXnZtVbKMipF5tv2RXkw/0=; b=QnNhY6VIVbV7+PQd4cm9PvAebWPB1SwibrwmNgR6fryf4PyvOjAnLPEBQPZ52cGYxw1u OUCMrIQrfPLS+lCC6FEA7cuTJuaGPoLIhDe2o5AS072RJ+jiK2idLiFmSmXH6nqeLV3i FviVY40SHQ6ucHHYpN/TMrUkA7faLHZCo3cbuNrI6VjbCrWnuNKUC0bLL6dL8CYto/Yo hq4ZkeFcF4rs+mMVXnzV0nwJ3H8jcwmKmUjb1MokQuDdoRlYytQIKbYKFJMjmxTJM4H9 swq6/XXY2vQ00S2s7s/X/DTAdFaylPAbZtCLYs2kEbeTaquWb4wcVYqFc/ky9oK4T+DY Aw== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3n1k56yswp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 12 Jan 2023 03:24:49 -0800 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Thu, 12 Jan 2023 03:24:37 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.42 via Frontend Transport; Thu, 12 Jan 2023 03:24:37 -0800 Received: from localhost.localdomain (unknown [10.28.36.185]) by maili.marvell.com (Postfix) with ESMTP id 47A353F70A0; Thu, 12 Jan 2023 03:24:16 -0800 (PST) From: Ankur Dwivedi <adwivedi@marvell.com> To: <dev@dpdk.org> CC: <thomas@monjalon.net>, <david.marchand@redhat.com>, <mdr@ashroe.eu>, <orika@nvidia.com>, <ferruh.yigit@amd.com>, <chas3@att.com>, <humin29@huawei.com>, <linville@tuxdriver.com>, <ciara.loftus@intel.com>, <qi.z.zhang@intel.com>, <mw@semihalf.com>, <mk@semihalf.com>, <shaibran@amazon.com>, <evgenys@amazon.com>, <igorch@amazon.com>, <chandu@amd.com>, <irusskikh@marvell.com>, <shepard.siegel@atomicrules.com>, <ed.czeck@atomicrules.com>, <john.miller@atomicrules.com>, <ajit.khaparde@broadcom.com>, <somnath.kotur@broadcom.com>, <jerinj@marvell.com>, <mczekaj@marvell.com>, <sthotton@marvell.com>, <srinivasan@marvell.com>, <hkalra@marvell.com>, <rahul.lakkireddy@chelsio.com>, <johndale@cisco.com>, <hyonkim@cisco.com>, <liudongdong3@huawei.com>, <yisen.zhuang@huawei.com>, <xuanziyang2@huawei.com>, <cloud.wangxiaoyun@huawei.com>, <zhouguoyang@huawei.com>, <simei.su@intel.com>, <wenjun1.wu@intel.com>, <qiming.yang@intel.com>, <Yuying.Zhang@intel.com>, <beilei.xing@intel.com>, <xiao.w.wang@intel.com>, <jingjing.wu@intel.com>, <junfeng.guo@intel.com>, <rosen.xu@intel.com>, <ndabilpuram@marvell.com>, <kirankumark@marvell.com>, <skori@marvell.com>, <skoteshwar@marvell.com>, <lironh@marvell.com>, <zr@semihalf.com>, <radhac@marvell.com>, <vburru@marvell.com>, <sedara@marvell.com>, <matan@nvidia.com>, <viacheslavo@nvidia.com>, <longli@microsoft.com>, <spinler@cesnet.cz>, <chaoyong.he@corigine.com>, <niklas.soderlund@corigine.com>, <hemant.agrawal@nxp.com>, <sachin.saxena@oss.nxp.com>, <g.singh@nxp.com>, <apeksha.gupta@nxp.com>, <sachin.saxena@nxp.com>, <aboyer@pensando.io>, <rmody@marvell.com>, <shshaikh@marvell.com>, <dsinghrawat@marvell.com>, <andrew.rybchenko@oktetlabs.ru>, <jiawenwu@trustnetic.com>, <jianwang@trustnetic.com>, <jbehrens@vmware.com>, <maxime.coquelin@redhat.com>, <chenbo.xia@intel.com>, <steven.webster@windriver.com>, <matt.peters@windriver.com>, <bruce.richardson@intel.com>, <mtetsuyah@gmail.com>, <grive@u256.net>, <jasvinder.singh@intel.com>, <cristian.dumitrescu@intel.com>, <jgrajcia@cisco.com>, <mb@smartsharesystems.com>, Ankur Dwivedi <adwivedi@marvell.com> Subject: [PATCH v5 5/6] ethdev: add trace points for mtr Date: Thu, 12 Jan 2023 16:51:39 +0530 Message-ID: <20230112112140.807233-6-adwivedi@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230112112140.807233-1-adwivedi@marvell.com> References: <20221222063306.3383695-1-adwivedi@marvell.com> <20230112112140.807233-1-adwivedi@marvell.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-ORIG-GUID: VEm4F8zrn1lmIWlqDzizC4CCKAowhAXe X-Proofpoint-GUID: VEm4F8zrn1lmIWlqDzizC4CCKAowhAXe X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2023-01-12_07,2023-01-12_01,2022-06-22_01 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions <dev.dpdk.org> List-Unsubscribe: <https://mails.dpdk.org/options/dev>, <mailto:dev-request@dpdk.org?subject=unsubscribe> List-Archive: <http://mails.dpdk.org/archives/dev/> List-Post: <mailto:dev@dpdk.org> List-Help: <mailto:dev-request@dpdk.org?subject=help> List-Subscribe: <https://mails.dpdk.org/listinfo/dev>, <mailto:dev-request@dpdk.org?subject=subscribe> Errors-To: dev-bounces@dpdk.org Adds trace points for rte_mtr specific functions in ethdev lib. Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com> --- lib/ethdev/ethdev_trace_points.c | 63 +++++++++++++ lib/ethdev/rte_ethdev_trace.h | 112 ++++++++++++++++++++++ lib/ethdev/rte_ethdev_trace_fp.h | 100 ++++++++++++++++++++ lib/ethdev/rte_mtr.c | 156 +++++++++++++++++++++++++++---- lib/ethdev/version.map | 21 +++++ 5 files changed, 434 insertions(+), 18 deletions(-) diff --git a/lib/ethdev/ethdev_trace_points.c b/lib/ethdev/ethdev_trace_points.c index 1953d90a5a..067e5fdab4 100644 --- a/lib/ethdev/ethdev_trace_points.c +++ b/lib/ethdev/ethdev_trace_points.c @@ -591,3 +591,66 @@ RTE_TRACE_POINT_REGISTER(rte_flow_trace_async_action_handle_update, RTE_TRACE_POINT_REGISTER(rte_flow_trace_async_action_handle_query, lib.ethdev.flow.async.action.handle.query) + +RTE_TRACE_POINT_REGISTER(rte_mtr_trace_capabilities_get, + lib.ethdev.mtr.capabilities_get) + +RTE_TRACE_POINT_REGISTER(rte_mtr_trace_create, + lib.ethdev.mtr.create) + +RTE_TRACE_POINT_REGISTER(rte_mtr_trace_destroy, + lib.ethdev.mtr.destroy) + +RTE_TRACE_POINT_REGISTER(rte_mtr_trace_meter_disable, + lib.ethdev.mtr.meter_disable) + +RTE_TRACE_POINT_REGISTER(rte_mtr_trace_meter_dscp_table_update, + lib.ethdev.mtr.meter_dscp_table_update) + +RTE_TRACE_POINT_REGISTER(rte_mtr_trace_meter_enable, + lib.ethdev.mtr.meter_enable) + +RTE_TRACE_POINT_REGISTER(rte_mtr_trace_meter_profile_add, + lib.ethdev.mtr.meter_profile_add) + +RTE_TRACE_POINT_REGISTER(rte_mtr_trace_meter_profile_delete, + lib.ethdev.mtr.meter_profile_delete) + +RTE_TRACE_POINT_REGISTER(rte_mtr_trace_meter_profile_get, + lib.ethdev.mtr.meter_profile_get) + +RTE_TRACE_POINT_REGISTER(rte_mtr_trace_meter_profile_update, + lib.ethdev.mtr.meter_profile_update) + +RTE_TRACE_POINT_REGISTER(rte_mtr_trace_stats_read, + lib.ethdev.mtr.stats_read) + +RTE_TRACE_POINT_REGISTER(rte_mtr_trace_stats_update, + lib.ethdev.mtr.stats_update) + +RTE_TRACE_POINT_REGISTER(rte_mtr_trace_meter_policy_add, + lib.ethdev.mtr.meter_policy_add) + +RTE_TRACE_POINT_REGISTER(rte_mtr_trace_meter_policy_delete, + lib.ethdev.mtr.meter_policy_delete) + +RTE_TRACE_POINT_REGISTER(rte_mtr_trace_meter_policy_get, + lib.ethdev.mtr.meter_policy_get) + +RTE_TRACE_POINT_REGISTER(rte_mtr_trace_meter_policy_update, + lib.ethdev.mtr.meter_policy_update) + +RTE_TRACE_POINT_REGISTER(rte_mtr_trace_meter_policy_validate, + lib.ethdev.mtr.meter_policy_validate) + +RTE_TRACE_POINT_REGISTER(rte_mtr_trace_meter_vlan_table_update, + lib.ethdev.mtr.meter_vlan_table_update) + +RTE_TRACE_POINT_REGISTER(rte_mtr_trace_color_in_protocol_get, + lib.ethdev.mtr.color_in_protocol_get) + +RTE_TRACE_POINT_REGISTER(rte_mtr_trace_color_in_protocol_priority_get, + lib.ethdev.mtr.color_in_protocol_priority_get) + +RTE_TRACE_POINT_REGISTER(rte_mtr_trace_color_in_protocol_set, + lib.ethdev.mtr.color_in_protocol_set) diff --git a/lib/ethdev/rte_ethdev_trace.h b/lib/ethdev/rte_ethdev_trace.h index 5bf7ffec6c..71994a9ab4 100644 --- a/lib/ethdev/rte_ethdev_trace.h +++ b/lib/ethdev/rte_ethdev_trace.h @@ -18,6 +18,7 @@ extern "C" { #include <rte_trace_point.h> #include "rte_ethdev.h" +#include "rte_mtr.h" RTE_TRACE_POINT( rte_ethdev_trace_configure, @@ -1285,6 +1286,117 @@ RTE_TRACE_POINT( rte_trace_point_emit_int(ret); ) +RTE_TRACE_POINT( + rte_mtr_trace_capabilities_get, + RTE_TRACE_POINT_ARGS(uint16_t port_id, + struct rte_mtr_capabilities *cap, int ret), + rte_trace_point_emit_u16(port_id); + rte_trace_point_emit_ptr(cap); + rte_trace_point_emit_int(ret); +) + +RTE_TRACE_POINT( + rte_mtr_trace_create, + RTE_TRACE_POINT_ARGS(uint16_t port_id, uint32_t mtr_id, + struct rte_mtr_params *params, int shared, int ret), + rte_trace_point_emit_u16(port_id); + rte_trace_point_emit_u32(mtr_id); + rte_trace_point_emit_ptr(params); + rte_trace_point_emit_u32(params->meter_profile_id); + rte_trace_point_emit_int(params->use_prev_mtr_color); + rte_trace_point_emit_int(params->meter_enable); + rte_trace_point_emit_u64(params->stats_mask); + rte_trace_point_emit_u32(params->meter_policy_id); + rte_trace_point_emit_int(params->default_input_color); + rte_trace_point_emit_int(shared); + rte_trace_point_emit_int(ret); +) + +RTE_TRACE_POINT( + rte_mtr_trace_destroy, + RTE_TRACE_POINT_ARGS(uint16_t port_id, uint32_t mtr_id, int ret), + rte_trace_point_emit_u16(port_id); + rte_trace_point_emit_u32(mtr_id); + rte_trace_point_emit_int(ret); +) + +RTE_TRACE_POINT( + rte_mtr_trace_meter_disable, + RTE_TRACE_POINT_ARGS(uint16_t port_id, uint32_t mtr_id, int ret), + rte_trace_point_emit_u16(port_id); + rte_trace_point_emit_u32(mtr_id); + rte_trace_point_emit_int(ret); +) + +RTE_TRACE_POINT( + rte_mtr_trace_meter_enable, + RTE_TRACE_POINT_ARGS(uint16_t port_id, uint32_t mtr_id, int ret), + rte_trace_point_emit_u16(port_id); + rte_trace_point_emit_u32(mtr_id); + rte_trace_point_emit_int(ret); +) + +RTE_TRACE_POINT( + rte_mtr_trace_meter_profile_add, + RTE_TRACE_POINT_ARGS(uint16_t port_id, + uint32_t meter_profile_id, + struct rte_mtr_meter_profile *profile, int ret), + rte_trace_point_emit_u16(port_id); + rte_trace_point_emit_u32(meter_profile_id); + rte_trace_point_emit_int(profile->alg); + rte_trace_point_emit_int(profile->packet_mode); + rte_trace_point_emit_int(ret); +) + +RTE_TRACE_POINT( + rte_mtr_trace_meter_profile_delete, + RTE_TRACE_POINT_ARGS(uint16_t port_id, + uint32_t meter_profile_id, int ret), + rte_trace_point_emit_u16(port_id); + rte_trace_point_emit_u32(meter_profile_id); + rte_trace_point_emit_int(ret); +) + +RTE_TRACE_POINT( + rte_mtr_trace_meter_policy_add, + RTE_TRACE_POINT_ARGS(uint16_t port_id, uint32_t policy_id, + const struct rte_flow_action *actions), + rte_trace_point_emit_u16(port_id); + rte_trace_point_emit_u32(policy_id); + rte_trace_point_emit_ptr(actions); + rte_trace_point_emit_int(actions->type); + rte_trace_point_emit_ptr(actions->conf); +) + +RTE_TRACE_POINT( + rte_mtr_trace_meter_policy_delete, + RTE_TRACE_POINT_ARGS(uint16_t port_id, uint32_t policy_id), + rte_trace_point_emit_u16(port_id); + rte_trace_point_emit_u32(policy_id); +) + +RTE_TRACE_POINT( + rte_mtr_trace_meter_policy_validate, + RTE_TRACE_POINT_ARGS(uint16_t port_id, + const struct rte_flow_action *actions), + rte_trace_point_emit_u16(port_id); + rte_trace_point_emit_ptr(actions); + rte_trace_point_emit_int(actions->type); + rte_trace_point_emit_ptr(actions->conf); +) + +RTE_TRACE_POINT( + rte_mtr_trace_color_in_protocol_set, + RTE_TRACE_POINT_ARGS(uint16_t port_id, uint32_t mtr_id, + enum rte_mtr_color_in_protocol proto, uint32_t priority, + int ret), + rte_trace_point_emit_u16(port_id); + rte_trace_point_emit_u32(mtr_id); + rte_trace_point_emit_int(proto); + rte_trace_point_emit_u32(priority); + rte_trace_point_emit_int(ret); +) + #ifdef __cplusplus } #endif diff --git a/lib/ethdev/rte_ethdev_trace_fp.h b/lib/ethdev/rte_ethdev_trace_fp.h index 57b98a3994..d7ab85f938 100644 --- a/lib/ethdev/rte_ethdev_trace_fp.h +++ b/lib/ethdev/rte_ethdev_trace_fp.h @@ -18,6 +18,7 @@ extern "C" { #include <rte_trace_point.h> #include "rte_ethdev.h" +#include "rte_mtr.h" RTE_TRACE_POINT_FP( rte_eth_trace_call_rx_callbacks, @@ -759,6 +760,105 @@ RTE_TRACE_POINT_FP( rte_trace_point_emit_int(ret); ) +RTE_TRACE_POINT_FP( + rte_mtr_trace_meter_profile_get, + RTE_TRACE_POINT_ARGS(uint16_t port_id, + uint32_t meter_profile_id, void *ret), + rte_trace_point_emit_u16(port_id); + rte_trace_point_emit_u32(meter_profile_id); + rte_trace_point_emit_ptr(ret); +) + +RTE_TRACE_POINT_FP( + rte_mtr_trace_meter_policy_get, + RTE_TRACE_POINT_ARGS(uint16_t port_id, uint32_t policy_id, + void *ret), + rte_trace_point_emit_u16(port_id); + rte_trace_point_emit_u32(policy_id); + rte_trace_point_emit_ptr(ret); +) + +RTE_TRACE_POINT_FP( + rte_mtr_trace_meter_profile_update, + RTE_TRACE_POINT_ARGS(uint16_t port_id, uint32_t mtr_id, + uint32_t meter_profile_id, int ret), + rte_trace_point_emit_u16(port_id); + rte_trace_point_emit_u32(mtr_id); + rte_trace_point_emit_u32(meter_profile_id); + rte_trace_point_emit_int(ret); +) + +RTE_TRACE_POINT_FP( + rte_mtr_trace_meter_policy_update, + RTE_TRACE_POINT_ARGS(uint16_t port_id, uint32_t mtr_id, + uint32_t meter_policy_id, int ret), + rte_trace_point_emit_u16(port_id); + rte_trace_point_emit_u32(mtr_id); + rte_trace_point_emit_u32(meter_policy_id); + rte_trace_point_emit_int(ret); +) + +RTE_TRACE_POINT_FP( + rte_mtr_trace_meter_dscp_table_update, + RTE_TRACE_POINT_ARGS(uint16_t port_id, uint32_t mtr_id, + enum rte_color *dscp_table, int ret), + rte_trace_point_emit_u16(port_id); + rte_trace_point_emit_u32(mtr_id); + rte_trace_point_emit_ptr(dscp_table); + rte_trace_point_emit_int(ret); +) + +RTE_TRACE_POINT_FP( + rte_mtr_trace_meter_vlan_table_update, + RTE_TRACE_POINT_ARGS(uint16_t port_id, uint32_t mtr_id, + enum rte_color *vlan_table, int ret), + rte_trace_point_emit_u16(port_id); + rte_trace_point_emit_u32(mtr_id); + rte_trace_point_emit_ptr(vlan_table); + rte_trace_point_emit_int(ret); +) + +RTE_TRACE_POINT_FP( + rte_mtr_trace_color_in_protocol_get, + RTE_TRACE_POINT_ARGS(uint16_t port_id, uint32_t mtr_id, int ret), + rte_trace_point_emit_u16(port_id); + rte_trace_point_emit_u32(mtr_id); + rte_trace_point_emit_int(ret); +) + +RTE_TRACE_POINT_FP( + rte_mtr_trace_color_in_protocol_priority_get, + RTE_TRACE_POINT_ARGS(uint16_t port_id, uint32_t mtr_id, + enum rte_mtr_color_in_protocol proto, int ret), + rte_trace_point_emit_u16(port_id); + rte_trace_point_emit_u32(mtr_id); + rte_trace_point_emit_int(proto); + rte_trace_point_emit_int(ret); +) + +RTE_TRACE_POINT_FP( + rte_mtr_trace_stats_read, + RTE_TRACE_POINT_ARGS(uint16_t port_id, uint32_t mtr_id, + struct rte_mtr_stats *stats, uint64_t *stats_mask, + int clear, int ret), + rte_trace_point_emit_u16(port_id); + rte_trace_point_emit_u32(mtr_id); + rte_trace_point_emit_ptr(stats); + rte_trace_point_emit_ptr(stats_mask); + rte_trace_point_emit_int(clear); + rte_trace_point_emit_int(ret); +) + +RTE_TRACE_POINT_FP( + rte_mtr_trace_stats_update, + RTE_TRACE_POINT_ARGS(uint16_t port_id, uint32_t mtr_id, + uint64_t stats_mask, int ret), + rte_trace_point_emit_u16(port_id); + rte_trace_point_emit_u32(mtr_id); + rte_trace_point_emit_u64(stats_mask); + rte_trace_point_emit_int(ret); +) + #ifdef __cplusplus } #endif diff --git a/lib/ethdev/rte_mtr.c b/lib/ethdev/rte_mtr.c index 3954839531..da092cd939 100644 --- a/lib/ethdev/rte_mtr.c +++ b/lib/ethdev/rte_mtr.c @@ -6,6 +6,8 @@ #include <rte_errno.h> #include "rte_ethdev.h" +#include "rte_ethdev_trace.h" +#include "rte_ethdev_trace_fp.h" #include "rte_mtr_driver.h" #include "rte_mtr.h" @@ -82,8 +84,14 @@ rte_mtr_capabilities_get(uint16_t port_id, struct rte_mtr_error *error) { struct rte_eth_dev *dev = &rte_eth_devices[port_id]; - return RTE_MTR_FUNC(port_id, capabilities_get)(dev, + int ret; + + ret = RTE_MTR_FUNC(port_id, capabilities_get)(dev, cap, error); + + rte_mtr_trace_capabilities_get(port_id, cap, ret); + + return ret; } /* MTR meter profile add */ @@ -94,8 +102,14 @@ rte_mtr_meter_profile_add(uint16_t port_id, struct rte_mtr_error *error) { struct rte_eth_dev *dev = &rte_eth_devices[port_id]; - return RTE_MTR_FUNC(port_id, meter_profile_add)(dev, + int ret; + + ret = RTE_MTR_FUNC(port_id, meter_profile_add)(dev, meter_profile_id, profile, error); + + rte_mtr_trace_meter_profile_add(port_id, meter_profile_id, profile, ret); + + return ret; } /** MTR meter profile delete */ @@ -105,8 +119,14 @@ rte_mtr_meter_profile_delete(uint16_t port_id, struct rte_mtr_error *error) { struct rte_eth_dev *dev = &rte_eth_devices[port_id]; - return RTE_MTR_FUNC(port_id, meter_profile_delete)(dev, + int ret; + + ret = RTE_MTR_FUNC(port_id, meter_profile_delete)(dev, meter_profile_id, error); + + rte_mtr_trace_meter_profile_delete(port_id, meter_profile_id, ret); + + return ret; } /** MTR meter profile get */ @@ -116,8 +136,14 @@ rte_mtr_meter_profile_get(uint16_t port_id, struct rte_mtr_error *error) { struct rte_eth_dev *dev = &rte_eth_devices[port_id]; - return RTE_MTR_HNDL_FUNC(port_id, meter_profile_get)(dev, + struct rte_flow_meter_profile *ret; + + ret = RTE_MTR_HNDL_FUNC(port_id, meter_profile_get)(dev, meter_profile_id, error); + + rte_mtr_trace_meter_profile_get(port_id, meter_profile_id, ret); + + return ret; } /* MTR meter policy validate */ @@ -127,6 +153,10 @@ rte_mtr_meter_policy_validate(uint16_t port_id, struct rte_mtr_error *error) { struct rte_eth_dev *dev = &rte_eth_devices[port_id]; + int i; + + for (i = 0; i < RTE_COLORS; i++) + rte_mtr_trace_meter_policy_validate(port_id, policy->actions[i]); return RTE_MTR_FUNC(port_id, meter_policy_validate)(dev, policy, error); } @@ -139,6 +169,11 @@ rte_mtr_meter_policy_add(uint16_t port_id, struct rte_mtr_error *error) { struct rte_eth_dev *dev = &rte_eth_devices[port_id]; + int i; + + for (i = 0; i < RTE_COLORS; i++) + rte_mtr_trace_meter_policy_add(port_id, policy_id, + policy->actions[i]); return RTE_MTR_FUNC(port_id, meter_policy_add)(dev, policy_id, policy, error); } @@ -150,6 +185,7 @@ rte_mtr_meter_policy_delete(uint16_t port_id, struct rte_mtr_error *error) { struct rte_eth_dev *dev = &rte_eth_devices[port_id]; + rte_mtr_trace_meter_policy_delete(port_id, policy_id); return RTE_MTR_FUNC(port_id, meter_policy_delete)(dev, policy_id, error); } @@ -161,8 +197,14 @@ rte_mtr_meter_policy_get(uint16_t port_id, struct rte_mtr_error *error) { struct rte_eth_dev *dev = &rte_eth_devices[port_id]; - return RTE_MTR_HNDL_FUNC(port_id, meter_policy_get)(dev, + struct rte_flow_meter_policy *ret; + + ret = RTE_MTR_HNDL_FUNC(port_id, meter_policy_get)(dev, policy_id, error); + + rte_mtr_trace_meter_policy_get(port_id, policy_id, ret); + + return ret; } /** MTR object create */ @@ -174,8 +216,14 @@ rte_mtr_create(uint16_t port_id, struct rte_mtr_error *error) { struct rte_eth_dev *dev = &rte_eth_devices[port_id]; - return RTE_MTR_FUNC(port_id, create)(dev, + int ret; + + ret = RTE_MTR_FUNC(port_id, create)(dev, mtr_id, params, shared, error); + + rte_mtr_trace_create(port_id, mtr_id, params, shared, ret); + + return ret; } /** MTR object destroy */ @@ -185,8 +233,14 @@ rte_mtr_destroy(uint16_t port_id, struct rte_mtr_error *error) { struct rte_eth_dev *dev = &rte_eth_devices[port_id]; - return RTE_MTR_FUNC(port_id, destroy)(dev, + int ret; + + ret = RTE_MTR_FUNC(port_id, destroy)(dev, mtr_id, error); + + rte_mtr_trace_destroy(port_id, mtr_id, ret); + + return ret; } /** MTR object meter enable */ @@ -196,8 +250,14 @@ rte_mtr_meter_enable(uint16_t port_id, struct rte_mtr_error *error) { struct rte_eth_dev *dev = &rte_eth_devices[port_id]; - return RTE_MTR_FUNC(port_id, meter_enable)(dev, + int ret; + + ret = RTE_MTR_FUNC(port_id, meter_enable)(dev, mtr_id, error); + + rte_mtr_trace_meter_enable(port_id, mtr_id, ret); + + return ret; } /** MTR object meter disable */ @@ -207,8 +267,14 @@ rte_mtr_meter_disable(uint16_t port_id, struct rte_mtr_error *error) { struct rte_eth_dev *dev = &rte_eth_devices[port_id]; - return RTE_MTR_FUNC(port_id, meter_disable)(dev, + int ret; + + ret = RTE_MTR_FUNC(port_id, meter_disable)(dev, mtr_id, error); + + rte_mtr_trace_meter_disable(port_id, mtr_id, ret); + + return ret; } /** MTR object meter profile update */ @@ -219,8 +285,14 @@ rte_mtr_meter_profile_update(uint16_t port_id, struct rte_mtr_error *error) { struct rte_eth_dev *dev = &rte_eth_devices[port_id]; - return RTE_MTR_FUNC(port_id, meter_profile_update)(dev, + int ret; + + ret = RTE_MTR_FUNC(port_id, meter_profile_update)(dev, mtr_id, meter_profile_id, error); + + rte_mtr_trace_meter_profile_update(port_id, mtr_id, meter_profile_id, ret); + + return ret; } /** MTR object meter policy update */ @@ -231,8 +303,14 @@ rte_mtr_meter_policy_update(uint16_t port_id, struct rte_mtr_error *error) { struct rte_eth_dev *dev = &rte_eth_devices[port_id]; - return RTE_MTR_FUNC(port_id, meter_policy_update)(dev, + int ret; + + ret = RTE_MTR_FUNC(port_id, meter_policy_update)(dev, mtr_id, meter_policy_id, error); + + rte_mtr_trace_meter_policy_update(port_id, mtr_id, meter_policy_id, ret); + + return ret; } /** MTR object meter DSCP table update */ @@ -243,8 +321,14 @@ rte_mtr_meter_dscp_table_update(uint16_t port_id, struct rte_mtr_error *error) { struct rte_eth_dev *dev = &rte_eth_devices[port_id]; - return RTE_MTR_FUNC(port_id, meter_dscp_table_update)(dev, + int ret; + + ret = RTE_MTR_FUNC(port_id, meter_dscp_table_update)(dev, mtr_id, proto, dscp_table, error); + + rte_mtr_trace_meter_dscp_table_update(port_id, mtr_id, dscp_table, ret); + + return ret; } /** MTR object meter VLAN table update */ @@ -255,8 +339,14 @@ rte_mtr_meter_vlan_table_update(uint16_t port_id, struct rte_mtr_error *error) { struct rte_eth_dev *dev = &rte_eth_devices[port_id]; - return RTE_MTR_FUNC(port_id, meter_vlan_table_update)(dev, + int ret; + + ret = RTE_MTR_FUNC(port_id, meter_vlan_table_update)(dev, mtr_id, proto, vlan_table, error); + + rte_mtr_trace_meter_vlan_table_update(port_id, mtr_id, vlan_table, ret); + + return ret; } /** Set the input color protocol on MTR object */ @@ -268,8 +358,14 @@ rte_mtr_color_in_protocol_set(uint16_t port_id, struct rte_mtr_error *error) { struct rte_eth_dev *dev = &rte_eth_devices[port_id]; - return RTE_MTR_FUNC(port_id, in_proto_set)(dev, + int ret; + + ret = RTE_MTR_FUNC(port_id, in_proto_set)(dev, mtr_id, proto, priority, error); + + rte_mtr_trace_color_in_protocol_set(port_id, mtr_id, proto, priority, ret); + + return ret; } /** Get input color protocols of MTR object */ @@ -280,8 +376,14 @@ rte_mtr_color_in_protocol_get(uint16_t port_id, struct rte_mtr_error *error) { struct rte_eth_dev *dev = &rte_eth_devices[port_id]; - return RTE_MTR_FUNC(port_id, in_proto_get)(dev, + int ret; + + ret = RTE_MTR_FUNC(port_id, in_proto_get)(dev, mtr_id, proto_mask, error); + + rte_mtr_trace_color_in_protocol_get(port_id, mtr_id, ret); + + return ret; } /** Get input color protocol priority of MTR object */ @@ -293,8 +395,14 @@ rte_mtr_color_in_protocol_priority_get(uint16_t port_id, struct rte_mtr_error *error) { struct rte_eth_dev *dev = &rte_eth_devices[port_id]; - return RTE_MTR_FUNC(port_id, in_proto_prio_get)(dev, + int ret; + + ret = RTE_MTR_FUNC(port_id, in_proto_prio_get)(dev, mtr_id, proto, priority, error); + + rte_mtr_trace_color_in_protocol_priority_get(port_id, mtr_id, proto, ret); + + return ret; } /** MTR object enabled stats update */ @@ -305,8 +413,14 @@ rte_mtr_stats_update(uint16_t port_id, struct rte_mtr_error *error) { struct rte_eth_dev *dev = &rte_eth_devices[port_id]; - return RTE_MTR_FUNC(port_id, stats_update)(dev, + int ret; + + ret = RTE_MTR_FUNC(port_id, stats_update)(dev, mtr_id, stats_mask, error); + + rte_mtr_trace_stats_update(port_id, mtr_id, stats_mask, ret); + + return ret; } /** MTR object stats read */ @@ -319,6 +433,12 @@ rte_mtr_stats_read(uint16_t port_id, struct rte_mtr_error *error) { struct rte_eth_dev *dev = &rte_eth_devices[port_id]; - return RTE_MTR_FUNC(port_id, stats_read)(dev, + int ret; + + ret = RTE_MTR_FUNC(port_id, stats_read)(dev, mtr_id, stats, stats_mask, clear, error); + + rte_mtr_trace_stats_read(port_id, mtr_id, stats, stats_mask, clear, ret); + + return ret; } diff --git a/lib/ethdev/version.map b/lib/ethdev/version.map index 0cb8222ad9..c1a6e4d30a 100644 --- a/lib/ethdev/version.map +++ b/lib/ethdev/version.map @@ -482,6 +482,27 @@ EXPERIMENTAL { __rte_flow_trace_tunnel_item_release; __rte_flow_trace_tunnel_match; __rte_flow_trace_validate; + __rte_mtr_trace_capabilities_get; + __rte_mtr_trace_color_in_protocol_get; + __rte_mtr_trace_color_in_protocol_priority_get; + __rte_mtr_trace_color_in_protocol_set; + __rte_mtr_trace_create; + __rte_mtr_trace_destroy; + __rte_mtr_trace_meter_disable; + __rte_mtr_trace_meter_dscp_table_update; + __rte_mtr_trace_meter_enable; + __rte_mtr_trace_meter_policy_add; + __rte_mtr_trace_meter_policy_delete; + __rte_mtr_trace_meter_policy_get; + __rte_mtr_trace_meter_policy_update; + __rte_mtr_trace_meter_policy_validate; + __rte_mtr_trace_meter_profile_add; + __rte_mtr_trace_meter_profile_delete; + __rte_mtr_trace_meter_profile_get; + __rte_mtr_trace_meter_profile_update; + __rte_mtr_trace_meter_vlan_table_update; + __rte_mtr_trace_stats_read; + __rte_mtr_trace_stats_update; }; INTERNAL { -- 2.25.1