From patchwork Fri Nov 23 16:54:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jasvinder Singh X-Patchwork-Id: 48331 X-Patchwork-Delegate: cristian.dumitrescu@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C76351B5C7; Fri, 23 Nov 2018 17:54:27 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 7E9C51B5C6 for ; Fri, 23 Nov 2018 17:54:26 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Nov 2018 08:54:25 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,270,1539673200"; d="scan'208";a="88172812" Received: from silpixa00381635.ir.intel.com (HELO silpixa00381635.ger.corp.intel.com) ([10.237.222.149]) by fmsmga007.fm.intel.com with ESMTP; 23 Nov 2018 08:54:23 -0800 From: Jasvinder Singh To: dev@dpdk.org Cc: cristian.dumitrescu@intel.com, Reshma Pattan Date: Fri, 23 Nov 2018 16:54:23 +0000 Message-Id: <20181123165423.134922-1-jasvinder.singh@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dpdk-dev] [PATCH] mbuf: implement generic format for sched field X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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" This patch implements the changes proposed in the deprecation notes [1][2]. The opaque mbuf->hash.sched field is updated to support generic definition in line with the ethdev TM and MTR APIs. The new generic format contains: queue ID, traffic class, color. In addtion, following API functions of the sched library have been modified with an additional parameter of type struct rte_sched_port to accomodate the changes made to mbuf sched field. (i) rte_sched_port_pkt_write() (ii) rte_sched_port_pkt_read() The other libraries, sample applications and tests which use mbuf sched field have been updated as well. [1] http://mails.dpdk.org/archives/dev/2018-February/090651.html [2] https://mails.dpdk.org/archives/dev/2018-November/119051.html Signed-off-by: Jasvinder Singh Signed-off-by: Reshma Pattan --- examples/qos_sched/app_thread.c | 6 +- examples/qos_sched/main.c | 1 + .../rte_event_eth_tx_adapter.h | 4 +- lib/librte_mbuf/Makefile | 2 +- lib/librte_mbuf/rte_mbuf.h | 10 +-- lib/librte_pipeline/rte_table_action.c | 60 ++++++++----- lib/librte_sched/Makefile | 2 +- lib/librte_sched/rte_sched.c | 89 +++++++------------ lib/librte_sched/rte_sched.h | 10 ++- test/test/test_sched.c | 8 +- 10 files changed, 92 insertions(+), 100 deletions(-) diff --git a/examples/qos_sched/app_thread.c b/examples/qos_sched/app_thread.c index a59274236..92da85039 100644 --- a/examples/qos_sched/app_thread.c +++ b/examples/qos_sched/app_thread.c @@ -73,8 +73,10 @@ app_rx_thread(struct thread_conf **confs) for(i = 0; i < nb_rx; i++) { get_pkt_sched(rx_mbufs[i], &subport, &pipe, &traffic_class, &queue, &color); - rte_sched_port_pkt_write(rx_mbufs[i], subport, pipe, - traffic_class, queue, (enum rte_meter_color) color); + rte_sched_port_pkt_write(conf->sched_port, rx_mbufs[i], + subport, pipe, + traffic_class, queue, + (enum rte_meter_color) color); } if (unlikely(rte_ring_sp_enqueue_bulk(conf->rx_ring, diff --git a/examples/qos_sched/main.c b/examples/qos_sched/main.c index e7c97bd64..c0ed16b68 100644 --- a/examples/qos_sched/main.c +++ b/examples/qos_sched/main.c @@ -55,6 +55,7 @@ app_main_loop(__attribute__((unused))void *dummy) flow->rx_thread.rx_port = flow->rx_port; flow->rx_thread.rx_ring = flow->rx_ring; flow->rx_thread.rx_queue = flow->rx_queue; + flow->rx_thread.sched_port = flow->sched_port; rx_confs[rx_idx++] = &flow->rx_thread; diff --git a/lib/librte_eventdev/rte_event_eth_tx_adapter.h b/lib/librte_eventdev/rte_event_eth_tx_adapter.h index 81456d4a9..8d4946ede 100644 --- a/lib/librte_eventdev/rte_event_eth_tx_adapter.h +++ b/lib/librte_eventdev/rte_event_eth_tx_adapter.h @@ -300,7 +300,7 @@ rte_event_eth_tx_adapter_queue_del(uint8_t id, static __rte_always_inline void __rte_experimental rte_event_eth_tx_adapter_txq_set(struct rte_mbuf *pkt, uint16_t queue) { - uint16_t *p = (uint16_t *)&pkt->hash.sched.hi; + uint16_t *p = (uint16_t *)&pkt->hash.sched.queue_id; p[1] = queue; } @@ -320,7 +320,7 @@ rte_event_eth_tx_adapter_txq_set(struct rte_mbuf *pkt, uint16_t queue) static __rte_always_inline uint16_t __rte_experimental rte_event_eth_tx_adapter_txq_get(struct rte_mbuf *pkt) { - uint16_t *p = (uint16_t *)&pkt->hash.sched.hi; + uint16_t *p = (uint16_t *)&pkt->hash.sched.queue_id; return p[1]; } diff --git a/lib/librte_mbuf/Makefile b/lib/librte_mbuf/Makefile index e2b98a254..8c4c7d790 100644 --- a/lib/librte_mbuf/Makefile +++ b/lib/librte_mbuf/Makefile @@ -11,7 +11,7 @@ LDLIBS += -lrte_eal -lrte_mempool EXPORT_MAP := rte_mbuf_version.map -LIBABIVER := 4 +LIBABIVER := 5 # all source are stored in SRCS-y SRCS-$(CONFIG_RTE_LIBRTE_MBUF) := rte_mbuf.c rte_mbuf_ptype.c rte_mbuf_pool_ops.c diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h index 3dbc6695e..98428bd21 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h @@ -575,12 +575,10 @@ struct rte_mbuf { */ } fdir; /**< Filter identifier if FDIR enabled */ struct { - uint32_t lo; - uint32_t hi; - /**< The event eth Tx adapter uses this field - * to store Tx queue id. - * @see rte_event_eth_tx_adapter_txq_set() - */ + uint32_t queue_id; /**< Queue ID. */ + uint8_t traffic_class; /**< Traffic class ID. */ + uint8_t color; /**< Color. */ + uint16_t reserved; /**< Reserved. */ } sched; /**< Hierarchical scheduler */ /**< User defined tags. See rte_distributor_process() */ uint32_t usr; diff --git a/lib/librte_pipeline/rte_table_action.c b/lib/librte_pipeline/rte_table_action.c index 7c7c8dd82..99f2d779b 100644 --- a/lib/librte_pipeline/rte_table_action.c +++ b/lib/librte_pipeline/rte_table_action.c @@ -108,12 +108,12 @@ mtr_cfg_check(struct rte_table_action_mtr_config *mtr) } #define MBUF_SCHED_QUEUE_TC_COLOR(queue, tc, color) \ - ((uint16_t)((((uint64_t)(queue)) & 0x3) | \ - ((((uint64_t)(tc)) & 0x3) << 2) | \ - ((((uint64_t)(color)) & 0x3) << 4))) + ((uint64_t)((((uint64_t)(queue)) & 0xffffffff) | \ + ((((uint64_t)(tc)) & 0xff) << 32) | \ + ((((uint64_t)(color)) & 0xff) << 40))) #define MBUF_SCHED_COLOR(sched, color) \ - (((sched) & (~0x30LLU)) | ((color) << 4)) + ((uint64_t)((sched) & (~0xff000000LLU)) | (((uint64_t)(color)) << 40)) struct mtr_trtcm_data { struct rte_meter_trtcm trtcm; @@ -176,7 +176,7 @@ mtr_data_size(struct rte_table_action_mtr_config *mtr) struct dscp_table_entry_data { enum rte_meter_color color; uint16_t tc; - uint16_t queue_tc_color; + uint32_t queue; }; struct dscp_table_data { @@ -368,7 +368,6 @@ tm_cfg_check(struct rte_table_action_tm_config *tm) } struct tm_data { - uint16_t queue_tc_color; uint16_t subport; uint32_t pipe; } __attribute__((__packed__)); @@ -397,26 +396,40 @@ tm_apply(struct tm_data *data, return status; /* Apply */ - data->queue_tc_color = 0; data->subport = (uint16_t) p->subport_id; data->pipe = p->pipe_id; return 0; } +static uint32_t +tm_sched_qindex(struct tm_data *data, + struct dscp_table_entry_data *dscp, + struct rte_table_action_tm_config *cfg) { + + uint32_t result; + + result = data->subport * cfg->n_pipes_per_subport + data->pipe; + result = result * RTE_TABLE_ACTION_TC_MAX + dscp->tc; + result = result * RTE_TABLE_ACTION_TC_QUEUE_MAX + dscp->queue; + + return result; +} + static __rte_always_inline void pkt_work_tm(struct rte_mbuf *mbuf, struct tm_data *data, struct dscp_table_data *dscp_table, - uint32_t dscp) + uint32_t dscp, + struct rte_table_action_tm_config *cfg) { struct dscp_table_entry_data *dscp_entry = &dscp_table->entry[dscp]; - struct tm_data *sched_ptr = (struct tm_data *) &mbuf->hash.sched; - struct tm_data sched; + uint64_t *sched_ptr = (uint64_t *) &mbuf->hash.sched; + uint32_t queue = tm_sched_qindex(data, dscp_entry, cfg); - sched = *data; - sched.queue_tc_color = dscp_entry->queue_tc_color; - *sched_ptr = sched; + *sched_ptr = MBUF_SCHED_QUEUE_TC_COLOR(queue, + dscp_entry->tc, + dscp_entry->color); } /** @@ -2580,17 +2593,13 @@ rte_table_action_dscp_table_update(struct rte_table_action *action, &action->dscp_table.entry[i]; struct rte_table_action_dscp_table_entry *entry = &table->entry[i]; - uint16_t queue_tc_color = - MBUF_SCHED_QUEUE_TC_COLOR(entry->tc_queue_id, - entry->tc_id, - entry->color); if ((dscp_mask & (1LLU << i)) == 0) continue; data->color = entry->color; data->tc = entry->tc_id; - data->queue_tc_color = queue_tc_color; + data->queue = entry->tc_queue_id; } return 0; @@ -2882,7 +2891,8 @@ pkt_work(struct rte_mbuf *mbuf, pkt_work_tm(mbuf, data, &action->dscp_table, - dscp); + dscp, + &cfg->tm); } if (cfg->action_mask & (1LLU << RTE_TABLE_ACTION_DECAP)) { @@ -3108,22 +3118,26 @@ pkt4_work(struct rte_mbuf **mbufs, pkt_work_tm(mbuf0, data0, &action->dscp_table, - dscp0); + dscp0, + &cfg->tm); pkt_work_tm(mbuf1, data1, &action->dscp_table, - dscp1); + dscp1, + &cfg->tm); pkt_work_tm(mbuf2, data2, &action->dscp_table, - dscp2); + dscp2, + &cfg->tm); pkt_work_tm(mbuf3, data3, &action->dscp_table, - dscp3); + dscp3, + &cfg->tm); } if (cfg->action_mask & (1LLU << RTE_TABLE_ACTION_DECAP)) { diff --git a/lib/librte_sched/Makefile b/lib/librte_sched/Makefile index 46c53ed71..644fd9d15 100644 --- a/lib/librte_sched/Makefile +++ b/lib/librte_sched/Makefile @@ -18,7 +18,7 @@ LDLIBS += -lrte_timer EXPORT_MAP := rte_sched_version.map -LIBABIVER := 1 +LIBABIVER := 2 # # all source are stored in SRCS-y diff --git a/lib/librte_sched/rte_sched.c b/lib/librte_sched/rte_sched.c index 587d5e602..7bf4d6400 100644 --- a/lib/librte_sched/rte_sched.c +++ b/lib/librte_sched/rte_sched.c @@ -128,22 +128,6 @@ enum grinder_state { e_GRINDER_READ_MBUF }; -/* - * Path through the scheduler hierarchy used by the scheduler enqueue - * operation to identify the destination queue for the current - * packet. Stored in the field pkt.hash.sched of struct rte_mbuf of - * each packet, typically written by the classification stage and read - * by scheduler enqueue. - */ -struct rte_sched_port_hierarchy { - uint16_t queue:2; /**< Queue ID (0 .. 3) */ - uint16_t traffic_class:2; /**< Traffic class ID (0 .. 3)*/ - uint32_t color:2; /**< Color */ - uint16_t unused:10; - uint16_t subport; /**< Subport ID */ - uint32_t pipe; /**< Pipe ID */ -}; - struct rte_sched_grinder { /* Pipe cache */ uint16_t pcache_qmask[RTE_SCHED_GRINDER_PCACHE_SIZE]; @@ -241,16 +225,12 @@ enum rte_sched_port_array { e_RTE_SCHED_PORT_ARRAY_TOTAL, }; -#ifdef RTE_SCHED_COLLECT_STATS - static inline uint32_t rte_sched_port_queues_per_subport(struct rte_sched_port *port) { return RTE_SCHED_QUEUES_PER_PIPE * port->n_pipes_per_subport; } -#endif - static inline uint32_t rte_sched_port_queues_per_port(struct rte_sched_port *port) { @@ -1006,44 +986,50 @@ rte_sched_port_pipe_profile_add(struct rte_sched_port *port, return 0; } +static inline uint32_t +rte_sched_port_qindex(struct rte_sched_port *port, + uint32_t subport, + uint32_t pipe, + uint32_t traffic_class, + uint32_t queue) +{ + uint32_t result; + + result = subport * port->n_pipes_per_subport + pipe; + result = result * RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE + traffic_class; + result = result * RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS + queue; + + return result; +} + void -rte_sched_port_pkt_write(struct rte_mbuf *pkt, +rte_sched_port_pkt_write(struct rte_sched_port *port, + struct rte_mbuf *pkt, uint32_t subport, uint32_t pipe, uint32_t traffic_class, uint32_t queue, enum rte_meter_color color) { - struct rte_sched_port_hierarchy *sched - = (struct rte_sched_port_hierarchy *) &pkt->hash.sched; - - RTE_BUILD_BUG_ON(sizeof(*sched) > sizeof(pkt->hash.sched)); - - sched->color = (uint32_t) color; - sched->subport = subport; - sched->pipe = pipe; - sched->traffic_class = traffic_class; - sched->queue = queue; + pkt->hash.sched.traffic_class = traffic_class; + pkt->hash.sched.queue_id = rte_sched_port_qindex(port, subport, pipe, + traffic_class, queue); + pkt->hash.sched.color = (uint8_t) color; } void -rte_sched_port_pkt_read_tree_path(const struct rte_mbuf *pkt, +rte_sched_port_pkt_read_tree_path(struct rte_sched_port *port, + const struct rte_mbuf *pkt, uint32_t *subport, uint32_t *pipe, uint32_t *traffic_class, uint32_t *queue) { - const struct rte_sched_port_hierarchy *sched - = (const struct rte_sched_port_hierarchy *) &pkt->hash.sched; - - *subport = sched->subport; - *pipe = sched->pipe; - *traffic_class = sched->traffic_class; - *queue = sched->queue; + *subport = pkt->hash.sched.queue_id / rte_sched_port_queues_per_subport(port); + *pipe = pkt->hash.sched.queue_id / RTE_SCHED_QUEUES_PER_PIPE; + *traffic_class = pkt->hash.sched.traffic_class; + *queue = pkt->hash.sched.queue_id % RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS; } enum rte_meter_color rte_sched_port_pkt_read_color(const struct rte_mbuf *pkt) { - const struct rte_sched_port_hierarchy *sched - = (const struct rte_sched_port_hierarchy *) &pkt->hash.sched; - - return (enum rte_meter_color) sched->color; + return (enum rte_meter_color) pkt->hash.sched.color; } int @@ -1100,18 +1086,6 @@ rte_sched_queue_read_stats(struct rte_sched_port *port, return 0; } -static inline uint32_t -rte_sched_port_qindex(struct rte_sched_port *port, uint32_t subport, uint32_t pipe, uint32_t traffic_class, uint32_t queue) -{ - uint32_t result; - - result = subport * port->n_pipes_per_subport + pipe; - result = result * RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE + traffic_class; - result = result * RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS + queue; - - return result; -} - #ifdef RTE_SCHED_DEBUG static inline int @@ -1272,11 +1246,8 @@ rte_sched_port_enqueue_qptrs_prefetch0(struct rte_sched_port *port, #ifdef RTE_SCHED_COLLECT_STATS struct rte_sched_queue_extra *qe; #endif - uint32_t subport, pipe, traffic_class, queue, qindex; - - rte_sched_port_pkt_read_tree_path(pkt, &subport, &pipe, &traffic_class, &queue); + uint32_t qindex = pkt->hash.sched.queue_id; - qindex = rte_sched_port_qindex(port, subport, pipe, traffic_class, queue); q = port->queue + qindex; rte_prefetch0(q); #ifdef RTE_SCHED_COLLECT_STATS diff --git a/lib/librte_sched/rte_sched.h b/lib/librte_sched/rte_sched.h index 84fa896de..4d9f869eb 100644 --- a/lib/librte_sched/rte_sched.h +++ b/lib/librte_sched/rte_sched.h @@ -355,6 +355,8 @@ rte_sched_queue_read_stats(struct rte_sched_port *port, * Scheduler hierarchy path write to packet descriptor. Typically * called by the packet classification stage. * + * @param port + * Handle to port scheduler instance * @param pkt * Packet descriptor handle * @param subport @@ -369,7 +371,8 @@ rte_sched_queue_read_stats(struct rte_sched_port *port, * Packet color set */ void -rte_sched_port_pkt_write(struct rte_mbuf *pkt, +rte_sched_port_pkt_write(struct rte_sched_port *port, + struct rte_mbuf *pkt, uint32_t subport, uint32_t pipe, uint32_t traffic_class, uint32_t queue, enum rte_meter_color color); @@ -379,6 +382,8 @@ rte_sched_port_pkt_write(struct rte_mbuf *pkt, * enqueue operation. The subport, pipe, traffic class and queue * parameters need to be pre-allocated by the caller. * + * @param port + * Handle to port scheduler instance * @param pkt * Packet descriptor handle * @param subport @@ -392,7 +397,8 @@ rte_sched_port_pkt_write(struct rte_mbuf *pkt, * */ void -rte_sched_port_pkt_read_tree_path(const struct rte_mbuf *pkt, +rte_sched_port_pkt_read_tree_path(struct rte_sched_port *port, + const struct rte_mbuf *pkt, uint32_t *subport, uint32_t *pipe, uint32_t *traffic_class, uint32_t *queue); diff --git a/test/test/test_sched.c b/test/test/test_sched.c index 32e500ba9..55f37c1e2 100644 --- a/test/test/test_sched.c +++ b/test/test/test_sched.c @@ -76,7 +76,7 @@ create_mempool(void) } static void -prepare_pkt(struct rte_mbuf *mbuf) +prepare_pkt(struct rte_sched_port *port, struct rte_mbuf *mbuf) { struct ether_hdr *eth_hdr; struct vlan_hdr *vlan1, *vlan2; @@ -95,7 +95,7 @@ prepare_pkt(struct rte_mbuf *mbuf) ip_hdr->dst_addr = IPv4(0,0,TC,QUEUE); - rte_sched_port_pkt_write(mbuf, SUBPORT, PIPE, TC, QUEUE, e_RTE_METER_YELLOW); + rte_sched_port_pkt_write(port, mbuf, SUBPORT, PIPE, TC, QUEUE, e_RTE_METER_YELLOW); /* 64 byte packet */ mbuf->pkt_len = 60; @@ -138,7 +138,7 @@ test_sched(void) for (i = 0; i < 10; i++) { in_mbufs[i] = rte_pktmbuf_alloc(mp); TEST_ASSERT_NOT_NULL(in_mbufs[i], "Packet allocation failed\n"); - prepare_pkt(in_mbufs[i]); + prepare_pkt(port, in_mbufs[i]); } @@ -155,7 +155,7 @@ test_sched(void) color = rte_sched_port_pkt_read_color(out_mbufs[i]); TEST_ASSERT_EQUAL(color, e_RTE_METER_YELLOW, "Wrong color\n"); - rte_sched_port_pkt_read_tree_path(out_mbufs[i], + rte_sched_port_pkt_read_tree_path(port, out_mbufs[i], &subport, &pipe, &traffic_class, &queue); TEST_ASSERT_EQUAL(subport, SUBPORT, "Wrong subport\n"); From patchwork Fri Dec 7 14:31:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Pattan, Reshma" X-Patchwork-Id: 48588 X-Patchwork-Delegate: cristian.dumitrescu@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EABFF5F1F; Fri, 7 Dec 2018 15:32:05 +0100 (CET) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 64A3E5B40 for ; Fri, 7 Dec 2018 15:32:02 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Dec 2018 06:32:01 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,326,1539673200"; d="scan'208";a="127980699" Received: from sivswdev02.ir.intel.com (HELO localhost.localdomain) ([10.237.217.46]) by fmsmga001.fm.intel.com with ESMTP; 07 Dec 2018 06:31:59 -0800 From: Reshma Pattan To: dev@dpdk.org, cristian.dumitrescu@intel.com, jerin.jacob@caviumnetworks.com, jasvinder.singh@intel.com Cc: Reshma Pattan Date: Fri, 7 Dec 2018 14:31:55 +0000 Message-Id: <1544193116-7058-2-git-send-email-reshma.pattan@intel.com> X-Mailer: git-send-email 1.7.0.7 In-Reply-To: <20181123165423.134922-1-jasvinder.singh@intel.com> References: <20181123165423.134922-1-jasvinder.singh@intel.com> Subject: [dpdk-dev] [PATCH v2 2/3] eal: add new rte color definition X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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" Added new rte_color definition in eal to consolidate color definition which is currently replicated in various places such as rte_meter.h, rte_tm.h and rte_mtr.h Removed rte_tm_color and rte_mtr_color and used the new color definition in rte_tm* and rte_mtr* files. Updated softnic and testpmd to use new color definition. Signed-off-by: Jasvinder Singh Signed-off-by: Reshma Pattan --- app/test-pmd/cmdline_mtr.c | 47 +++++++++++---------- app/test-pmd/cmdline_tm.c | 23 +++++----- drivers/net/softnic/rte_eth_softnic_flow.c | 10 +++-- drivers/net/softnic/rte_eth_softnic_meter.c | 28 ++++++------ drivers/net/softnic/rte_eth_softnic_tm.c | 31 ++++++++------ lib/librte_eal/common/Makefile | 2 +- lib/librte_eal/common/include/rte_color.h | 18 ++++++++ lib/librte_ethdev/rte_mtr.c | 2 +- lib/librte_ethdev/rte_mtr.h | 21 +++------ lib/librte_ethdev/rte_mtr_driver.h | 2 +- lib/librte_ethdev/rte_tm.h | 25 ++++------- lib/librte_meter/rte_meter.h | 7 +++ 12 files changed, 118 insertions(+), 98 deletions(-) create mode 100644 lib/librte_eal/common/include/rte_color.h diff --git a/app/test-pmd/cmdline_mtr.c b/app/test-pmd/cmdline_mtr.c index c506d87ee..3d7861d14 100644 --- a/app/test-pmd/cmdline_mtr.c +++ b/app/test-pmd/cmdline_mtr.c @@ -9,6 +9,7 @@ #include #include #include +#include #include "testpmd.h" #include "cmdline_mtr.h" @@ -74,7 +75,7 @@ parse_uint(uint64_t *value, const char *str) } static int -parse_dscp_table_entries(char *str, enum rte_mtr_color **dscp_table) +parse_dscp_table_entries(char *str, enum rte_color **dscp_table) { char *token; int i = 0; @@ -84,21 +85,21 @@ parse_dscp_table_entries(char *str, enum rte_mtr_color **dscp_table) return 0; /* Allocate memory for dscp table */ - *dscp_table = (enum rte_mtr_color *)malloc(MAX_DSCP_TABLE_ENTRIES * - sizeof(enum rte_mtr_color)); + *dscp_table = (enum rte_color *)malloc(MAX_DSCP_TABLE_ENTRIES * + sizeof(enum rte_color)); if (*dscp_table == NULL) return -1; while (1) { if (strcmp(token, "G") == 0 || strcmp(token, "g") == 0) - *dscp_table[i++] = RTE_MTR_GREEN; + *dscp_table[i++] = RTE_COLOR_GREEN; else if (strcmp(token, "Y") == 0 || strcmp(token, "y") == 0) - *dscp_table[i++] = RTE_MTR_YELLOW; + *dscp_table[i++] = RTE_COLOR_YELLOW; else if (strcmp(token, "R") == 0 || strcmp(token, "r") == 0) - *dscp_table[i++] = RTE_MTR_RED; + *dscp_table[i++] = RTE_COLOR_RED; else { free(*dscp_table); return -1; @@ -117,7 +118,7 @@ parse_dscp_table_entries(char *str, enum rte_mtr_color **dscp_table) static int parse_meter_color_str(char *c_str, uint32_t *use_prev_meter_color, - enum rte_mtr_color **dscp_table) + enum rte_color **dscp_table) { char *token; uint64_t previous_mtr_color = 0; @@ -182,20 +183,20 @@ parse_policer_action_string(char *p_str, uint32_t action_mask, return -1; if (g_color == 0 && (action_mask & 0x1)) { - actions[RTE_MTR_GREEN] = action; + actions[RTE_COLOR_GREEN] = action; g_color = 1; } else if (y_color == 0 && (action_mask & 0x2)) { - actions[RTE_MTR_YELLOW] = action; + actions[RTE_COLOR_YELLOW] = action; y_color = 1; } else - actions[RTE_MTR_RED] = action; + actions[RTE_COLOR_RED] = action; } return 0; } static int parse_multi_token_string(char *t_str, uint16_t *port_id, - uint32_t *mtr_id, enum rte_mtr_color **dscp_table) + uint32_t *mtr_id, enum rte_color **dscp_table) { char *token; uint64_t val; @@ -782,7 +783,7 @@ static void cmd_create_port_meter_parsed(void *parsed_result, uint32_t shared = res->shared; uint32_t use_prev_meter_color = 0; uint16_t port_id = res->port_id; - enum rte_mtr_color *dscp_table = NULL; + enum rte_color *dscp_table = NULL; char *c_str = res->meter_input_color; int ret; @@ -808,11 +809,11 @@ static void cmd_create_port_meter_parsed(void *parsed_result, else params.meter_enable = 0; - params.action[RTE_MTR_GREEN] = + params.action[RTE_COLOR_GREEN] = string_to_policer_action(res->g_action); - params.action[RTE_MTR_YELLOW] = + params.action[RTE_COLOR_YELLOW] = string_to_policer_action(res->y_action); - params.action[RTE_MTR_RED] = + params.action[RTE_COLOR_RED] = string_to_policer_action(res->r_action); params.stats_mask = res->statistics_mask; @@ -1134,7 +1135,7 @@ static void cmd_set_port_meter_dscp_table_parsed(void *parsed_result, { struct cmd_set_port_meter_dscp_table_result *res = parsed_result; struct rte_mtr_error error; - enum rte_mtr_color *dscp_table = NULL; + enum rte_color *dscp_table = NULL; char *t_str = res->token_string; uint32_t mtr_id = 0; uint16_t port_id; @@ -1245,7 +1246,7 @@ static void cmd_set_port_meter_policer_action_parsed(void *parsed_result, } /* Allocate memory for policer actions */ - actions = (enum rte_mtr_policer_action *)malloc(RTE_MTR_COLORS * + actions = (enum rte_mtr_policer_action *)malloc(RTE_COLORS * sizeof(enum rte_mtr_policer_action)); if (actions == NULL) { printf("Memory for policer actions not allocated (error)\n"); @@ -1426,22 +1427,22 @@ static void cmd_show_port_meter_stats_parsed(void *parsed_result, /* Display stats */ if (stats_mask & RTE_MTR_STATS_N_PKTS_GREEN) printf("\tPkts G: %" PRIu64 "\n", - stats.n_pkts[RTE_MTR_GREEN]); + stats.n_pkts[RTE_COLOR_GREEN]); if (stats_mask & RTE_MTR_STATS_N_BYTES_GREEN) printf("\tBytes G: %" PRIu64 "\n", - stats.n_bytes[RTE_MTR_GREEN]); + stats.n_bytes[RTE_COLOR_GREEN]); if (stats_mask & RTE_MTR_STATS_N_PKTS_YELLOW) printf("\tPkts Y: %" PRIu64 "\n", - stats.n_pkts[RTE_MTR_YELLOW]); + stats.n_pkts[RTE_COLOR_YELLOW]); if (stats_mask & RTE_MTR_STATS_N_BYTES_YELLOW) printf("\tBytes Y: %" PRIu64 "\n", - stats.n_bytes[RTE_MTR_YELLOW]); + stats.n_bytes[RTE_COLOR_YELLOW]); if (stats_mask & RTE_MTR_STATS_N_PKTS_RED) printf("\tPkts R: %" PRIu64 "\n", - stats.n_pkts[RTE_MTR_RED]); + stats.n_pkts[RTE_COLOR_RED]); if (stats_mask & RTE_MTR_STATS_N_BYTES_RED) printf("\tBytes R: %" PRIu64 "\n", - stats.n_bytes[RTE_MTR_RED]); + stats.n_bytes[RTE_COLOR_RED]); if (stats_mask & RTE_MTR_STATS_N_PKTS_DROPPED) printf("\tPkts DROPPED: %" PRIu64 "\n", stats.n_pkts_dropped); diff --git a/app/test-pmd/cmdline_tm.c b/app/test-pmd/cmdline_tm.c index 4c763482a..753ea2c99 100644 --- a/app/test-pmd/cmdline_tm.c +++ b/app/test-pmd/cmdline_tm.c @@ -9,6 +9,7 @@ #include #include #include +#include #include "testpmd.h" #include "cmdline_tm.h" @@ -296,7 +297,7 @@ static void cmd_show_port_tm_cap_parsed(void *parsed_result, printf("cap.cman_wred_context_shared_n_contexts_per_node_max %" PRIu32 "\n", cap.cman_wred_context_shared_n_contexts_per_node_max); - for (i = 0; i < RTE_TM_COLORS; i++) { + for (i = 0; i < RTE_COLORS; i++) { printf("cap.mark_vlan_dei_supported %" PRId32 "\n", cap.mark_vlan_dei_supported[i]); printf("cap.mark_ip_ecn_tcp_supported %" PRId32 "\n", @@ -642,22 +643,22 @@ static void cmd_show_port_tm_node_stats_parsed(void *parsed_result, stats.n_bytes); if (stats_mask & RTE_TM_STATS_N_PKTS_GREEN_DROPPED) printf("\tPkts dropped (green): %" PRIu64 "\n", - stats.leaf.n_pkts_dropped[RTE_TM_GREEN]); + stats.leaf.n_pkts_dropped[RTE_COLOR_GREEN]); if (stats_mask & RTE_TM_STATS_N_PKTS_YELLOW_DROPPED) printf("\tPkts dropped (yellow): %" PRIu64 "\n", - stats.leaf.n_pkts_dropped[RTE_TM_YELLOW]); + stats.leaf.n_pkts_dropped[RTE_COLOR_YELLOW]); if (stats_mask & RTE_TM_STATS_N_PKTS_RED_DROPPED) printf("\tPkts dropped (red): %" PRIu64 "\n", - stats.leaf.n_pkts_dropped[RTE_TM_RED]); + stats.leaf.n_pkts_dropped[RTE_COLOR_RED]); if (stats_mask & RTE_TM_STATS_N_BYTES_GREEN_DROPPED) printf("\tBytes dropped (green): %" PRIu64 "\n", - stats.leaf.n_bytes_dropped[RTE_TM_GREEN]); + stats.leaf.n_bytes_dropped[RTE_COLOR_GREEN]); if (stats_mask & RTE_TM_STATS_N_BYTES_YELLOW_DROPPED) printf("\tBytes dropped (yellow): %" PRIu64 "\n", - stats.leaf.n_bytes_dropped[RTE_TM_YELLOW]); + stats.leaf.n_bytes_dropped[RTE_COLOR_YELLOW]); if (stats_mask & RTE_TM_STATS_N_BYTES_RED_DROPPED) printf("\tBytes dropped (red): %" PRIu64 "\n", - stats.leaf.n_bytes_dropped[RTE_TM_RED]); + stats.leaf.n_bytes_dropped[RTE_COLOR_RED]); if (stats_mask & RTE_TM_STATS_N_PKTS_QUEUED) printf("\tPkts queued: %" PRIu64 "\n", stats.leaf.n_pkts_queued); @@ -1267,7 +1268,7 @@ static void cmd_add_port_tm_node_wred_profile_parsed(void *parsed_result, { struct cmd_add_port_tm_node_wred_profile_result *res = parsed_result; struct rte_tm_wred_params wp; - enum rte_tm_color color; + enum rte_color color; struct rte_tm_error error; uint32_t wred_profile_id = res->wred_profile_id; portid_t port_id = res->port_id; @@ -1280,7 +1281,7 @@ static void cmd_add_port_tm_node_wred_profile_parsed(void *parsed_result, memset(&error, 0, sizeof(struct rte_tm_error)); /* WRED Params (Green Color)*/ - color = RTE_TM_GREEN; + color = RTE_COLOR_GREEN; wp.red_params[color].min_th = res->min_th_g; wp.red_params[color].max_th = res->max_th_g; wp.red_params[color].maxp_inv = res->maxp_inv_g; @@ -1288,14 +1289,14 @@ static void cmd_add_port_tm_node_wred_profile_parsed(void *parsed_result, /* WRED Params (Yellow Color)*/ - color = RTE_TM_YELLOW; + color = RTE_COLOR_YELLOW; wp.red_params[color].min_th = res->min_th_y; wp.red_params[color].max_th = res->max_th_y; wp.red_params[color].maxp_inv = res->maxp_inv_y; wp.red_params[color].wq_log2 = res->wq_log2_y; /* WRED Params (Red Color)*/ - color = RTE_TM_RED; + color = RTE_COLOR_RED; wp.red_params[color].min_th = res->min_th_r; wp.red_params[color].max_th = res->max_th_r; wp.red_params[color].maxp_inv = res->maxp_inv_r; diff --git a/drivers/net/softnic/rte_eth_softnic_flow.c b/drivers/net/softnic/rte_eth_softnic_flow.c index 21e753001..1a4322fef 100644 --- a/drivers/net/softnic/rte_eth_softnic_flow.c +++ b/drivers/net/softnic/rte_eth_softnic_flow.c @@ -12,6 +12,7 @@ #include #include #include +#include #include "rte_eth_softnic_internals.h" #include "rte_eth_softnic.h" @@ -1624,11 +1625,14 @@ flow_rule_action_get(struct pmd_internals *softnic, /* RTE_TABLE_ACTION_METER */ rule_action->mtr.mtr[0].meter_profile_id = meter_profile_id; rule_action->mtr.mtr[0].policer[e_RTE_METER_GREEN] = - softnic_table_action_policer(m->params.action[RTE_MTR_GREEN]); + softnic_table_action_policer + (m->params.action[RTE_COLOR_GREEN]); rule_action->mtr.mtr[0].policer[e_RTE_METER_YELLOW] = - softnic_table_action_policer(m->params.action[RTE_MTR_YELLOW]); + softnic_table_action_policer + (m->params.action[RTE_COLOR_YELLOW]); rule_action->mtr.mtr[0].policer[e_RTE_METER_RED] = - softnic_table_action_policer(m->params.action[RTE_MTR_RED]); + softnic_table_action_policer + (m->params.action[RTE_COLOR_RED]); rule_action->mtr.tc_mask = 1; rule_action->action_mask |= 1 << RTE_TABLE_ACTION_MTR; break; diff --git a/drivers/net/softnic/rte_eth_softnic_meter.c b/drivers/net/softnic/rte_eth_softnic_meter.c index 7b747ba5d..3a0ec84b1 100644 --- a/drivers/net/softnic/rte_eth_softnic_meter.c +++ b/drivers/net/softnic/rte_eth_softnic_meter.c @@ -8,6 +8,7 @@ #include #include +#include #include "rte_eth_softnic_internals.h" @@ -458,7 +459,7 @@ pmd_mtr_meter_profile_update(struct rte_eth_dev *dev, static int pmd_mtr_meter_dscp_table_update(struct rte_eth_dev *dev, uint32_t mtr_id, - enum rte_mtr_color *dscp_table, + enum rte_color *dscp_table, struct rte_mtr_error *error) { struct pmd_internals *p = dev->data->dev_private; @@ -536,7 +537,7 @@ pmd_mtr_policer_actions_update(struct rte_eth_dev *dev, NULL, "Invalid actions"); - for (i = 0; i < RTE_MTR_COLORS; i++) { + for (i = 0; i < RTE_COLORS; i++) { if (action_mask & (1 << i)) { if (actions[i] != MTR_POLICER_ACTION_COLOR_GREEN && actions[i] != MTR_POLICER_ACTION_COLOR_YELLOW && @@ -560,7 +561,7 @@ pmd_mtr_policer_actions_update(struct rte_eth_dev *dev, memcpy(&action, &m->flow->action, sizeof(action)); /* Set action */ - for (i = 0; i < RTE_MTR_COLORS; i++) + for (i = 0; i < RTE_COLORS; i++) if (action_mask & (1 << i)) action.mtr.mtr[0].policer[i] = softnic_table_action_policer(actions[i]); @@ -588,7 +589,7 @@ pmd_mtr_policer_actions_update(struct rte_eth_dev *dev, } /* Meter: Update policer actions */ - for (i = 0; i < RTE_MTR_COLORS; i++) + for (i = 0; i < RTE_COLORS; i++) if (action_mask & (1 << i)) m->params.action[i] = actions[i]; @@ -618,15 +619,17 @@ mtr_stats_convert(struct softnic_mtr *m, if (in->n_packets_valid) { uint32_t i; - for (i = 0; i < RTE_MTR_COLORS; i++) { + for (i = 0; i < RTE_COLORS; i++) { if (m->params.action[i] == MTR_POLICER_ACTION_COLOR_GREEN) - out->n_pkts[RTE_MTR_GREEN] += in->n_packets[i]; + out->n_pkts[RTE_COLOR_GREEN] += + in->n_packets[i]; if (m->params.action[i] == MTR_POLICER_ACTION_COLOR_YELLOW) - out->n_pkts[RTE_MTR_YELLOW] += in->n_packets[i]; + out->n_pkts[RTE_COLOR_YELLOW] += + in->n_packets[i]; if (m->params.action[i] == MTR_POLICER_ACTION_COLOR_RED) - out->n_pkts[RTE_MTR_RED] += in->n_packets[i]; + out->n_pkts[RTE_COLOR_RED] += in->n_packets[i]; if (m->params.action[i] == MTR_POLICER_ACTION_DROP) out->n_pkts_dropped += in->n_packets[i]; @@ -638,15 +641,16 @@ mtr_stats_convert(struct softnic_mtr *m, if (in->n_bytes_valid) { uint32_t i; - for (i = 0; i < RTE_MTR_COLORS; i++) { + for (i = 0; i < RTE_COLORS; i++) { if (m->params.action[i] == MTR_POLICER_ACTION_COLOR_GREEN) - out->n_bytes[RTE_MTR_GREEN] += in->n_bytes[i]; + out->n_bytes[RTE_COLOR_GREEN] += in->n_bytes[i]; if (m->params.action[i] == MTR_POLICER_ACTION_COLOR_YELLOW) - out->n_bytes[RTE_MTR_YELLOW] += in->n_bytes[i]; + out->n_bytes[RTE_COLOR_YELLOW] += + in->n_bytes[i]; if (m->params.action[i] == MTR_POLICER_ACTION_COLOR_RED) - out->n_bytes[RTE_MTR_RED] += in->n_bytes[i]; + out->n_bytes[RTE_COLOR_RED] += in->n_bytes[i]; if (m->params.action[i] == MTR_POLICER_ACTION_DROP) out->n_bytes_dropped += in->n_bytes[i]; diff --git a/drivers/net/softnic/rte_eth_softnic_tm.c b/drivers/net/softnic/rte_eth_softnic_tm.c index baaafbe29..e1012ac3d 100644 --- a/drivers/net/softnic/rte_eth_softnic_tm.c +++ b/drivers/net/softnic/rte_eth_softnic_tm.c @@ -8,6 +8,7 @@ #include #include +#include #include "rte_eth_softnic_internals.h" #include "rte_eth_softnic.h" @@ -1204,7 +1205,7 @@ wred_profile_check(struct rte_eth_dev *dev, struct rte_tm_error *error) { struct tm_wred_profile *wp; - enum rte_tm_color color; + enum rte_color color; /* WRED profile ID must not be NONE. */ if (wred_profile_id == RTE_TM_WRED_PROFILE_ID_NONE) @@ -1240,7 +1241,7 @@ wred_profile_check(struct rte_eth_dev *dev, rte_strerror(ENOTSUP)); /* min_th <= max_th, max_th > 0 */ - for (color = RTE_TM_GREEN; color < RTE_TM_COLORS; color++) { + for (color = RTE_COLOR_GREEN; color < RTE_COLORS; color++) { uint32_t min_th = profile->red_params[color].min_th; uint32_t max_th = profile->red_params[color].max_th; @@ -2218,10 +2219,10 @@ wred_profiles_set(struct rte_eth_dev *dev) struct pmd_internals *p = dev->data->dev_private; struct rte_sched_port_params *pp = &p->soft.tm.params.port_params; uint32_t tc_id; - enum rte_tm_color color; + enum rte_color color; for (tc_id = 0; tc_id < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; tc_id++) - for (color = RTE_TM_GREEN; color < RTE_TM_COLORS; color++) { + for (color = RTE_COLOR_GREEN; color < RTE_COLORS; color++) { struct rte_red_params *dst = &pp->red_params[tc_id][color]; struct tm_wred_profile *src_wp = @@ -3058,9 +3059,9 @@ read_port_stats(struct rte_eth_dev *dev, s.n_pkts_tc[id] - s.n_pkts_tc_dropped[id]; nr->stats.n_bytes += s.n_bytes_tc[id] - s.n_bytes_tc_dropped[id]; - nr->stats.leaf.n_pkts_dropped[RTE_TM_GREEN] += + nr->stats.leaf.n_pkts_dropped[RTE_COLOR_GREEN] += s.n_pkts_tc_dropped[id]; - nr->stats.leaf.n_bytes_dropped[RTE_TM_GREEN] += + nr->stats.leaf.n_bytes_dropped[RTE_COLOR_GREEN] += s.n_bytes_tc_dropped[id]; } } @@ -3105,9 +3106,9 @@ read_subport_stats(struct rte_eth_dev *dev, s.n_pkts_tc[tc_id] - s.n_pkts_tc_dropped[tc_id]; ns->stats.n_bytes += s.n_bytes_tc[tc_id] - s.n_bytes_tc_dropped[tc_id]; - ns->stats.leaf.n_pkts_dropped[RTE_TM_GREEN] += + ns->stats.leaf.n_pkts_dropped[RTE_COLOR_GREEN] += s.n_pkts_tc_dropped[tc_id]; - ns->stats.leaf.n_bytes_dropped[RTE_TM_GREEN] += + ns->stats.leaf.n_bytes_dropped[RTE_COLOR_GREEN] += s.n_bytes_tc_dropped[tc_id]; } @@ -3162,8 +3163,9 @@ read_pipe_stats(struct rte_eth_dev *dev, /* Stats accumulate */ np->stats.n_pkts += s.n_pkts - s.n_pkts_dropped; np->stats.n_bytes += s.n_bytes - s.n_bytes_dropped; - np->stats.leaf.n_pkts_dropped[RTE_TM_GREEN] += s.n_pkts_dropped; - np->stats.leaf.n_bytes_dropped[RTE_TM_GREEN] += + np->stats.leaf.n_pkts_dropped[RTE_COLOR_GREEN] += + s.n_pkts_dropped; + np->stats.leaf.n_bytes_dropped[RTE_COLOR_GREEN] += s.n_bytes_dropped; np->stats.leaf.n_pkts_queued = qlen; } @@ -3222,8 +3224,9 @@ read_tc_stats(struct rte_eth_dev *dev, /* Stats accumulate */ nt->stats.n_pkts += s.n_pkts - s.n_pkts_dropped; nt->stats.n_bytes += s.n_bytes - s.n_bytes_dropped; - nt->stats.leaf.n_pkts_dropped[RTE_TM_GREEN] += s.n_pkts_dropped; - nt->stats.leaf.n_bytes_dropped[RTE_TM_GREEN] += + nt->stats.leaf.n_pkts_dropped[RTE_COLOR_GREEN] += + s.n_pkts_dropped; + nt->stats.leaf.n_bytes_dropped[RTE_COLOR_GREEN] += s.n_bytes_dropped; nt->stats.leaf.n_pkts_queued = qlen; } @@ -3281,8 +3284,8 @@ read_queue_stats(struct rte_eth_dev *dev, /* Stats accumulate */ nq->stats.n_pkts += s.n_pkts - s.n_pkts_dropped; nq->stats.n_bytes += s.n_bytes - s.n_bytes_dropped; - nq->stats.leaf.n_pkts_dropped[RTE_TM_GREEN] += s.n_pkts_dropped; - nq->stats.leaf.n_bytes_dropped[RTE_TM_GREEN] += + nq->stats.leaf.n_pkts_dropped[RTE_COLOR_GREEN] += s.n_pkts_dropped; + nq->stats.leaf.n_bytes_dropped[RTE_COLOR_GREEN] += s.n_bytes_dropped; nq->stats.leaf.n_pkts_queued = qlen; diff --git a/lib/librte_eal/common/Makefile b/lib/librte_eal/common/Makefile index 87d8c455d..c76bb2dd7 100644 --- a/lib/librte_eal/common/Makefile +++ b/lib/librte_eal/common/Makefile @@ -17,7 +17,7 @@ INC += rte_pci_dev_feature_defs.h rte_pci_dev_features.h INC += rte_malloc.h rte_keepalive.h rte_time.h INC += rte_service.h rte_service_component.h INC += rte_bitmap.h rte_vfio.h rte_hypervisor.h rte_test.h -INC += rte_reciprocal.h rte_fbarray.h rte_uuid.h +INC += rte_reciprocal.h rte_fbarray.h rte_uuid.h rte_color.h GENERIC_INC := rte_atomic.h rte_byteorder.h rte_cycles.h rte_prefetch.h GENERIC_INC += rte_spinlock.h rte_memcpy.h rte_cpuflags.h rte_rwlock.h diff --git a/lib/librte_eal/common/include/rte_color.h b/lib/librte_eal/common/include/rte_color.h new file mode 100644 index 000000000..f4387071b --- /dev/null +++ b/lib/librte_eal/common/include/rte_color.h @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2018 Intel Corporation + */ + +#ifndef _RTE_COLOR_H_ +#define _RTE_COLOR_H_ + +/** + * Color + */ +enum rte_color { + RTE_COLOR_GREEN = 0, /**< Green */ + RTE_COLOR_YELLOW, /**< Yellow */ + RTE_COLOR_RED, /**< Red */ + RTE_COLORS /**< Number of colors */ +}; + +#endif /* _RTE_COLOR_H_ */ diff --git a/lib/librte_ethdev/rte_mtr.c b/lib/librte_ethdev/rte_mtr.c index 1046cb5fd..12b815406 100644 --- a/lib/librte_ethdev/rte_mtr.c +++ b/lib/librte_ethdev/rte_mtr.c @@ -153,7 +153,7 @@ rte_mtr_meter_profile_update(uint16_t port_id, int __rte_experimental rte_mtr_meter_dscp_table_update(uint16_t port_id, uint32_t mtr_id, - enum rte_mtr_color *dscp_table, + enum rte_color *dscp_table, struct rte_mtr_error *error) { struct rte_eth_dev *dev = &rte_eth_devices[port_id]; diff --git a/lib/librte_ethdev/rte_mtr.h b/lib/librte_ethdev/rte_mtr.h index c4819b274..113db06a9 100644 --- a/lib/librte_ethdev/rte_mtr.h +++ b/lib/librte_ethdev/rte_mtr.h @@ -76,21 +76,12 @@ #include #include #include +#include #ifdef __cplusplus extern "C" { #endif -/** - * Color - */ -enum rte_mtr_color { - RTE_MTR_GREEN = 0, /**< Green */ - RTE_MTR_YELLOW, /**< Yellow */ - RTE_MTR_RED, /**< Red */ - RTE_MTR_COLORS /**< Number of colors. */ -}; - /** * Statistics counter type */ @@ -125,10 +116,10 @@ enum rte_mtr_stats_type { */ struct rte_mtr_stats { /** Number of packets passed by the policer (per color). */ - uint64_t n_pkts[RTE_MTR_COLORS]; + uint64_t n_pkts[RTE_COLORS]; /** Number of bytes passed by the policer (per color). */ - uint64_t n_bytes[RTE_MTR_COLORS]; + uint64_t n_bytes[RTE_COLORS]; /** Number of packets dropped by the policer. */ uint64_t n_pkts_dropped; @@ -260,7 +251,7 @@ struct rte_mtr_params { * at least one yellow or red color element, then the color aware mode * is configured. */ - enum rte_mtr_color *dscp_table; + enum rte_color *dscp_table; /** Non-zero to enable the meter, zero to disable the meter at the time * of MTR object creation. Ignored when the meter profile indicated by @@ -270,7 +261,7 @@ struct rte_mtr_params { int meter_enable; /** Policer actions (per meter output color). */ - enum rte_mtr_policer_action action[RTE_MTR_COLORS]; + enum rte_mtr_policer_action action[RTE_COLORS]; /** Set of stats counters to be enabled. * @see enum rte_mtr_stats_type @@ -636,7 +627,7 @@ rte_mtr_meter_profile_update(uint16_t port_id, int __rte_experimental rte_mtr_meter_dscp_table_update(uint16_t port_id, uint32_t mtr_id, - enum rte_mtr_color *dscp_table, + enum rte_color *dscp_table, struct rte_mtr_error *error); /** diff --git a/lib/librte_ethdev/rte_mtr_driver.h b/lib/librte_ethdev/rte_mtr_driver.h index c9a6d7c38..3ec7ffa2a 100644 --- a/lib/librte_ethdev/rte_mtr_driver.h +++ b/lib/librte_ethdev/rte_mtr_driver.h @@ -70,7 +70,7 @@ typedef int (*rte_mtr_meter_profile_update_t)(struct rte_eth_dev *dev, typedef int (*rte_mtr_meter_dscp_table_update_t)(struct rte_eth_dev *dev, uint32_t mtr_id, - enum rte_mtr_color *dscp_table, + enum rte_color *dscp_table, struct rte_mtr_error *error); /**< @internal MTR object meter DSCP table update */ diff --git a/lib/librte_ethdev/rte_tm.h b/lib/librte_ethdev/rte_tm.h index 646ef3880..95f322313 100644 --- a/lib/librte_ethdev/rte_tm.h +++ b/lib/librte_ethdev/rte_tm.h @@ -51,6 +51,7 @@ #include #include +#include #ifdef __cplusplus extern "C" { @@ -115,16 +116,6 @@ extern "C" { */ #define RTE_TM_NODE_LEVEL_ID_ANY UINT32_MAX -/** - * Color - */ -enum rte_tm_color { - RTE_TM_GREEN = 0, /**< Green */ - RTE_TM_YELLOW, /**< Yellow */ - RTE_TM_RED, /**< Red */ - RTE_TM_COLORS /**< Number of colors */ -}; - /** * Node statistics counter type */ @@ -179,12 +170,12 @@ struct rte_tm_node_stats { /** Number of packets dropped by current leaf node per each * color. */ - uint64_t n_pkts_dropped[RTE_TM_COLORS]; + uint64_t n_pkts_dropped[RTE_COLORS]; /** Number of bytes dropped by current leaf node per each * color. */ - uint64_t n_bytes_dropped[RTE_TM_COLORS]; + uint64_t n_bytes_dropped[RTE_COLORS]; /** Number of packets currently waiting in the packet queue of * current leaf node. @@ -435,16 +426,16 @@ struct rte_tm_capabilities { uint32_t cman_wred_context_shared_n_contexts_per_node_max; /** Support for VLAN DEI packet marking (per color). */ - int mark_vlan_dei_supported[RTE_TM_COLORS]; + int mark_vlan_dei_supported[RTE_COLORS]; /** Support for IPv4/IPv6 ECN marking of TCP packets (per color). */ - int mark_ip_ecn_tcp_supported[RTE_TM_COLORS]; + int mark_ip_ecn_tcp_supported[RTE_COLORS]; /** Support for IPv4/IPv6 ECN marking of SCTP packets (per color). */ - int mark_ip_ecn_sctp_supported[RTE_TM_COLORS]; + int mark_ip_ecn_sctp_supported[RTE_COLORS]; /** Support for IPv4/IPv6 DSCP packet marking (per color). */ - int mark_ip_dscp_supported[RTE_TM_COLORS]; + int mark_ip_dscp_supported[RTE_COLORS]; /** Set of supported dynamic update operations. * @see enum rte_tm_dynamic_update_type @@ -861,7 +852,7 @@ struct rte_tm_red_params { */ struct rte_tm_wred_params { /** One set of RED parameters per packet color */ - struct rte_tm_red_params red_params[RTE_TM_COLORS]; + struct rte_tm_red_params red_params[RTE_COLORS]; /** When non-zero, the *min_th* and *max_th* thresholds are specified * in packets (WRED packet mode). When zero, the *min_th* and *max_th* diff --git a/lib/librte_meter/rte_meter.h b/lib/librte_meter/rte_meter.h index 58a051583..e6187c49d 100644 --- a/lib/librte_meter/rte_meter.h +++ b/lib/librte_meter/rte_meter.h @@ -21,6 +21,7 @@ extern "C" { #include +#include /* * Application Programmer's Interface (API) * @@ -34,6 +35,12 @@ enum rte_meter_color { e_RTE_METER_COLORS /**< Number of available colors */ }; +/* New rte_color is defined and used to deprecate rte_meter_color soon. */ +#define rte_meter_color rte_color +#define e_RTE_METER_GREEN RTE_COLOR_GREEN +#define e_RTE_METER_YELLOW RTE_COLOR_YELLOW +#define e_RTE_METER_RED RTE_COLOR_RED + /** srTCM parameters per metered traffic flow. The CIR, CBS and EBS parameters only count bytes of IP packets and do not include link specific headers. At least one of the CBS or EBS parameters has to be greater than zero. */ From patchwork Fri Dec 7 14:31:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Pattan, Reshma" X-Patchwork-Id: 48589 X-Patchwork-Delegate: cristian.dumitrescu@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4A8F15F29; Fri, 7 Dec 2018 15:32:07 +0100 (CET) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 316805323 for ; Fri, 7 Dec 2018 15:32:03 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Dec 2018 06:32:02 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,326,1539673200"; d="scan'208";a="127980712" Received: from sivswdev02.ir.intel.com (HELO localhost.localdomain) ([10.237.217.46]) by fmsmga001.fm.intel.com with ESMTP; 07 Dec 2018 06:32:01 -0800 From: Reshma Pattan To: dev@dpdk.org, cristian.dumitrescu@intel.com, jerin.jacob@caviumnetworks.com, jasvinder.singh@intel.com Cc: Reshma Pattan Date: Fri, 7 Dec 2018 14:31:56 +0000 Message-Id: <1544193116-7058-3-git-send-email-reshma.pattan@intel.com> X-Mailer: git-send-email 1.7.0.7 In-Reply-To: <20181123165423.134922-1-jasvinder.singh@intel.com> References: <20181123165423.134922-1-jasvinder.singh@intel.com> Subject: [dpdk-dev] [PATCH v2 3/3] doc: add deprecation notice to remove rte meter color X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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" Added deprecation notice to replace rte_meter_color with rte_color. Signed-off-by: Reshma Pattan Acked-by: Cristian Dumitrescu --- doc/guides/rel_notes/deprecation.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 60e081a54..1c771d865 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -95,3 +95,8 @@ Deprecation Notices - ``rte_pdump_set_socket_dir`` will be removed; - The parameter, ``path``, of ``rte_pdump_init`` will be removed; - The enum ``rte_pdump_socktype`` will be removed. + +* meter: New ``rte_color`` definition will be added in 19.02 and that will + replace ``enum rte_meter_color`` in meter library in 19.05. This will help + to consolidate color definition, which is currently replicated in many places, + such as: rte_meter.h, rte_mtr.h, rte_tm.h.