From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 4B9BF1B112 for ; Tue, 11 Dec 2018 20:02:47 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Dec 2018 11:02:46 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,343,1539673200"; d="scan'208";a="99895844" Received: from irsmsx107.ger.corp.intel.com ([163.33.3.99]) by orsmga006.jf.intel.com with ESMTP; 11 Dec 2018 11:02:44 -0800 Received: from irsmsx108.ger.corp.intel.com ([169.254.11.26]) by IRSMSX107.ger.corp.intel.com ([169.254.10.125]) with mapi id 14.03.0415.000; Tue, 11 Dec 2018 19:02:43 +0000 From: "Dumitrescu, Cristian" To: "Pattan, Reshma" , "dev@dpdk.org" , "jerin.jacob@caviumnetworks.com" , "Singh, Jasvinder" Thread-Topic: [PATCH v2 1/3] mbuf: implement generic format for sched field Thread-Index: AQHUjjmeC9zlXFUwSEqSf1/HZKhSr6V5rldw Date: Tue, 11 Dec 2018 19:02:43 +0000 Message-ID: <3EB4FA525960D640B5BDFFD6A3D891268E813754@IRSMSX108.ger.corp.intel.com> References: <20181123165423.134922-1-jasvinder.singh@intel.com> <1544193116-7058-1-git-send-email-reshma.pattan@intel.com> In-Reply-To: <1544193116-7058-1-git-send-email-reshma.pattan@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMmU2ZWVmM2YtMjFiZi00ZGFiLTljMzMtMWQ3MzRmYjRiOWY5IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiaVdnZXNpSWd1SHN5VnVnWTZ5QTlYNEE1TWJ0dW1uOXhEbVZhS1dcL0lFT1BQZjMrdEFzZ0NGNlgxKzhNK09DU0IifQ== x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [163.33.239.181] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH v2 1/3] 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: , X-List-Received-Date: Tue, 11 Dec 2018 19:02:48 -0000 > -----Original Message----- > From: Pattan, Reshma > Sent: Friday, December 7, 2018 2:32 PM > To: dev@dpdk.org; Dumitrescu, Cristian ; > jerin.jacob@caviumnetworks.com; Singh, Jasvinder > > Cc: Pattan, Reshma > Subject: [PATCH v2 1/3] mbuf: implement generic format for sched field >=20 > This patch implements the changes proposed in the deprecation > notes [1][2]. >=20 > librte_mbuf changes: > The 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. >=20 > Added public APIs to set and get these new fields to and from mbuf. >=20 > librte_sched changes: > In addtion, following API functions of the sched library have > been modified with an additional parameter of type struct > rte_sched_port to accommodate the changes made to mbuf sched field. > (i) rte_sched_port_pkt_write() > (ii) rte_sched_port_pkt_read_tree_path() >=20 > librte_pipeline, qos_sched UT, qos_sched app are updated > to make use of new changes. >=20 > Also mbuf::hash::txadpater have been added for eventdev txq, > rte_event_eth_tx_adapter_txq_set and > rte_event_eth_tx_adapter_txq_get() > are updated to use uses mbuf::hash::txadpater.txq. >=20 > doc: > Release notes updated. > Removed deprecation notice for mbuf::hash::sched and sched API. >=20 > [1] http://mails.dpdk.org/archives/dev/2018-February/090651.html > [2] https://mails.dpdk.org/archives/dev/2018-November/119051.html >=20 > Signed-off-by: Jasvinder Singh > Signed-off-by: Reshma Pattan > --- > doc/guides/rel_notes/deprecation.rst | 10 -- > doc/guides/rel_notes/release_19_02.rst | 15 ++- > examples/qos_sched/app_thread.c | 7 +- > examples/qos_sched/main.c | 1 + > .../rte_event_eth_tx_adapter.h | 14 +-- > lib/librte_mbuf/Makefile | 2 +- > lib/librte_mbuf/rte_mbuf.h | 112 +++++++++++++++++- > lib/librte_pipeline/rte_table_action.c | 75 +++++++----- > lib/librte_sched/Makefile | 2 +- > lib/librte_sched/rte_sched.c | 97 +++++++-------- > lib/librte_sched/rte_sched.h | 10 +- > test/test/test_sched.c | 9 +- > 12 files changed, 234 insertions(+), 120 deletions(-) >=20 > diff --git a/doc/guides/rel_notes/release_19_02.rst > b/doc/guides/rel_notes/release_19_02.rst > index a94fa86a7..24ba00d04 100644 > --- a/doc/guides/rel_notes/release_19_02.rst > +++ b/doc/guides/rel_notes/release_19_02.rst > @@ -83,6 +83,11 @@ API Changes > Also, make sure to start the actual text at the margin. > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D >=20 > +* The below functions of the sched library have been modified with an > + additional parameter of type ``struct rte_sched_port`` to accommodate > + the changes made to mbuf::hash::sched field. > + (i) rte_sched_port_pkt_write() > + (ii) rte_sched_port_pkt_read_tree_path() >=20 > ABI Changes > ----------- > @@ -99,6 +104,12 @@ ABI Changes > Also, make sure to start the actual text at the margin. > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D >=20 > +* The 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``. > + > +* The mbuf:hash:txadapter is now added for eventdev txq. The txadapter > + format now contains ``reserved1, reserved2 and txq``. >=20 IMO these changes are too small to make it to the release notes, I suggest = we remove them from here. > diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h > index 3dbc6695e..accd98d9b 100644 > --- a/lib/librte_mbuf/rte_mbuf.h > +++ b/lib/librte_mbuf/rte_mbuf.h > @@ -575,13 +575,23 @@ struct rte_mbuf { > */ > } fdir; /**< Filter identifier if FDIR enabled */ > struct { > - uint32_t lo; > - uint32_t hi; > + uint32_t queue_id; /**< Queue ID. */ > + uint8_t traffic_class; > + /**< Traffic class ID. Traffic class 0 is high > + * priority traffic class. > + */ This comment is too fuzzy, my initial suggestion was: Traffic class 0 is th= e highest priority traffic class. > + uint8_t color; /**< Color. */ Already suggested the following: 1. Include the new file "rte_color.h" in this file 2. Clearly connect this field to its real type, i.e. enum rte_color through= the proper Doxygen syntax: /**< Color. @see enum rte_color. */ > + uint16_t reserved; /**< Reserved. */ > + } sched; /**< Hierarchical scheduler */ > + struct { > + uint32_t reserved1; > + uint16_t reserved2; > + uint16_t txq; > /**< The event eth Tx adapter uses this field > * to store Tx queue id. > * @see > rte_event_eth_tx_adapter_txq_set() > */ > - } sched; /**< Hierarchical scheduler */ > + } txadapter; /**< Eventdev ethdev Tx adapter */ > /**< User defined tags. See > rte_distributor_process() */ > uint32_t usr; > } hash; /**< hash information */ > @@ -2289,6 +2299,102 @@ rte_pktmbuf_linearize(struct rte_mbuf *mbuf) > */ > void rte_pktmbuf_dump(FILE *f, const struct rte_mbuf *m, unsigned > dump_len); >=20 > +/** > + * Reads the value of an mbuf's sched queue_id field. > + */ > +static inline uint32_t > +rte_mbuf_sched_queue_read(const struct rte_mbuf *m) > +{ > + return m->hash.sched.queue_id; > +} Let's name these functions *_get instead of *_read, which pairs up with the= *_set functions below. Applicable to all get/set functions: The comment should contain an imperati= ve verb, i.e. "Get the value ...." instead of "Gets the value ...". > + > +/** > + * Reads the value of an mbuf's sched traffic_class field. > + */ > +static inline uint8_t > +rte_mbuf_sched_traffic_class_read(const struct rte_mbuf *m) > +{ > + return m->hash.sched.traffic_class; > +} > + > +/** > + * Reads the value of an mbuf's sched color field. > + */ > +static inline uint8_t > +rte_mbuf_sched_color_read(const struct rte_mbuf *m) > +{ > + return m->hash.sched.color; > +} The type of the return value should be enum rte_color instead of uint8_t: static inline enum rte_color rte_mbuf_sched_color_read(const struct rte_mbuf *m) { return (enum rte_color)m->hash.sched.color; } > + > +/** > + * Sets an mbuf's sched queue_id to the defined value. > + */ > +static inline void > +rte_mbuf_sched_queue_set(struct rte_mbuf *m, uint32_t qid) > +{ > + m->hash.sched.queue_id =3D qid; > +} Let's use the full name queue_id instead of qid, please. > + > +/** > + * Sets an mbuf's sched traffic_class id to the defined value. > + */ > +static inline void > +rte_mbuf_sched_traffic_class_set(struct rte_mbuf *m, uint8_t tc) > +{ > + m->hash.sched.traffic_class =3D tc; > +} > + Same here. > +/** > + * Sets an mbuf's sched color id to the defined value. > + */ > +static inline void > +rte_mbuf_sched_color_set(struct rte_mbuf *m, uint8_t color) > +{ > + m->hash.sched.color =3D color; > +} The color parameter type should be enum rte_color, not uint8_t: static inline void rte_mbuf_sched_color_set(struct rte_mbuf *m, enum rte_color color) { m->hash.sched.color =3D (uint8_t)color; } > + > +/** > + * Reads the values of an mbuf's sched queue_id, traffic_class and color= . > + * @param m > + * Mbuf to read > + * @param qid > + * Returns the queue id > + * @param tc > + * Returns the traffic class id > + * @param color > + * Returns the colour id > + */ > +static inline void > +rte_mbuf_sched_read(const struct rte_mbuf *m, uint32_t *qid, > + uint8_t *tc, > + uint8_t *color) > +{ > + *qid =3D m->hash.sched.queue_id; > + *tc =3D m->hash.sched.traffic_class; > + *color =3D m->hash.sched.color; > +} Color type should be enum rte_color instead of uint8_t. Full names, not abbreviated names, please. Please move this function above with the other *_get functions (i.e. before= any *_set function). > + > +/** > + * Sets the mbuf's sched queue_id, traffic_class and color. > + * @param m > + * Mbuf to set > + * @param qid > + * Queue id value to be set > + * @param tc > + * Traffic class id value to be set > + * @param color > + * Color id to be set > + */ > +static inline void > +rte_mbuf_sched_set(struct rte_mbuf *m, uint32_t qid, > + uint8_t tc, > + uint8_t color) > +{ > + m->hash.sched.queue_id =3D qid; > + m->hash.sched.traffic_class =3D tc; > + m->hash.sched.color =3D color; > +} Color type should be enum rte_color instead of uint8_t. Full names, not abbreviated names, please. > + > #ifdef __cplusplus > } > #endif > diff --git a/lib/librte_pipeline/rte_table_action.c > b/lib/librte_pipeline/rte_table_action.c > index 7c7c8dd82..f9768b9cc 100644 > --- a/lib/librte_pipeline/rte_table_action.c > +++ b/lib/librte_pipeline/rte_table_action.c > @@ -107,14 +107,6 @@ mtr_cfg_check(struct rte_table_action_mtr_config > *mtr) > return 0; > } >=20 > -#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))) > - > -#define MBUF_SCHED_COLOR(sched, color) \ > - (((sched) & (~0x30LLU)) | ((color) << 4)) > - > struct mtr_trtcm_data { > struct rte_meter_trtcm trtcm; > uint64_t stats[e_RTE_METER_COLORS]; > @@ -176,7 +168,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; > }; In this data structure, let's rename queue as tc_queue, as it better illust= rates what it is, i.e. queue within the traffic class. In order to preserve the size of this data structure (8 bytes), let's use u= int16_t to store tc_queue field. >=20 > struct dscp_table_data { > @@ -319,8 +311,7 @@ pkt_work_mtr(struct rte_mbuf *mbuf, > uint32_t dscp, > uint16_t total_length) > { > - uint64_t drop_mask, sched; > - uint64_t *sched_ptr =3D (uint64_t *) &mbuf->hash.sched; > + uint64_t drop_mask; > struct dscp_table_entry_data *dscp_entry =3D &dscp_table- > >entry[dscp]; > enum rte_meter_color color_in, color_meter, color_policer; > uint32_t tc, mp_id; > @@ -329,7 +320,6 @@ pkt_work_mtr(struct rte_mbuf *mbuf, > color_in =3D dscp_entry->color; > data +=3D tc; > mp_id =3D MTR_TRTCM_DATA_METER_PROFILE_ID_GET(data); > - sched =3D *sched_ptr; >=20 > /* Meter */ > color_meter =3D rte_meter_trtcm_color_aware_check( > @@ -346,7 +336,7 @@ pkt_work_mtr(struct rte_mbuf *mbuf, > drop_mask =3D > MTR_TRTCM_DATA_POLICER_ACTION_DROP_GET(data, color_meter); > color_policer =3D > MTR_TRTCM_DATA_POLICER_ACTION_COLOR_GET(data, > color_meter); > - *sched_ptr =3D MBUF_SCHED_COLOR(sched, color_policer); > + rte_mbuf_sched_color_set(mbuf, color_policer); >=20 > return drop_mask; > } > @@ -368,11 +358,16 @@ tm_cfg_check(struct rte_table_action_tm_config > *tm) > } >=20 > struct tm_data { > - uint16_t queue_tc_color; > uint16_t subport; > uint32_t pipe; > } __attribute__((__packed__)); >=20 In order to preserve the current size for this data structure (8 bytes), le= t's have subport type as uint32_t. > +/* log2 representation of tm configuration */ I suggest to remove this comment. > +struct tm_cfg { > + uint32_t subports_per_port_log2; > + uint32_t pipes_per_subport_log2; > +} __attribute__((__packed__)); > + For readability purpose, it is probably better to preserve the names, so pl= ease use n_subports_per_port_log2 and n_pipes_per_subport_log2. > static int > tm_apply_check(struct rte_table_action_tm_params *p, > struct rte_table_action_tm_config *cfg) > @@ -397,26 +392,37 @@ tm_apply(struct tm_data *data, > return status; >=20 > /* Apply */ > - data->queue_tc_color =3D 0; > data->subport =3D (uint16_t) p->subport_id; > data->pipe =3D p->pipe_id; >=20 > return 0; > } >=20 > +static uint32_t > +tm_sched_qindex(struct tm_data *data, > + struct dscp_table_entry_data *dscp, > + struct tm_cfg *tm) > +{ > + uint32_t result; > + > + result =3D (data->subport << tm->pipes_per_subport_log2) + data- > >pipe; > + result =3D result * RTE_TABLE_ACTION_TC_MAX + dscp->tc; > + result =3D result * RTE_TABLE_ACTION_TC_QUEUE_MAX + dscp- > >queue; > + > + return result; > +} > + We can do this in a single assignment (replace the multiplication with 4 by= shift left with 2). > 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 tm_cfg *tm) > { > struct dscp_table_entry_data *dscp_entry =3D &dscp_table- > >entry[dscp]; > - struct tm_data *sched_ptr =3D (struct tm_data *) &mbuf->hash.sched; > - struct tm_data sched; > + uint32_t queue =3D tm_sched_qindex(data, dscp_entry, tm); >=20 > - sched =3D *data; > - sched.queue_tc_color =3D dscp_entry->queue_tc_color; > - *sched_ptr =3D sched; > + rte_mbuf_sched_set(mbuf, queue, dscp_entry->tc, dscp_entry- > >color); > } >=20 > /** > @@ -2440,6 +2446,7 @@ struct rte_table_action { > struct ap_data data; > struct dscp_table_data dscp_table; > struct meter_profile_data mp[METER_PROFILES_MAX]; > + struct tm_cfg tm; > }; >=20 > struct rte_table_action * > @@ -2465,6 +2472,11 @@ rte_table_action_create(struct > rte_table_action_profile *profile, > memcpy(&action->cfg, &profile->cfg, sizeof(profile->cfg)); > memcpy(&action->data, &profile->data, sizeof(profile->data)); >=20 > + action->tm.subports_per_port_log2 =3D > + __builtin_ctz(profile->cfg.tm.n_subports_per_port); > + action->tm.pipes_per_subport_log2 =3D > + __builtin_ctz(profile->cfg.tm.n_pipes_per_subport); > + > return action; > } >=20 > @@ -2580,17 +2592,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 =3D > &table->entry[i]; > - uint16_t queue_tc_color =3D > - MBUF_SCHED_QUEUE_TC_COLOR(entry- > >tc_queue_id, > - entry->tc_id, > - entry->color); >=20 > if ((dscp_mask & (1LLU << i)) =3D=3D 0) > continue; >=20 > data->color =3D entry->color; > data->tc =3D entry->tc_id; > - data->queue_tc_color =3D queue_tc_color; > + data->queue =3D entry->tc_queue_id; > } >=20 > return 0; > @@ -2882,7 +2890,8 @@ pkt_work(struct rte_mbuf *mbuf, > pkt_work_tm(mbuf, > data, > &action->dscp_table, > - dscp); > + dscp, > + &action->tm); > } >=20 > if (cfg->action_mask & (1LLU << RTE_TABLE_ACTION_DECAP)) { > @@ -3108,22 +3117,26 @@ pkt4_work(struct rte_mbuf **mbufs, > pkt_work_tm(mbuf0, > data0, > &action->dscp_table, > - dscp0); > + dscp0, > + &action->tm); >=20 > pkt_work_tm(mbuf1, > data1, > &action->dscp_table, > - dscp1); > + dscp1, > + &action->tm); >=20 > pkt_work_tm(mbuf2, > data2, > &action->dscp_table, > - dscp2); > + dscp2, > + &action->tm); >=20 > pkt_work_tm(mbuf3, > data3, > &action->dscp_table, > - dscp3); > + dscp3, > + &action->tm); > } >=20 > 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 +=3D -lrte_timer >=20 > EXPORT_MAP :=3D rte_sched_version.map >=20 > -LIBABIVER :=3D 1 > +LIBABIVER :=3D 2 >=20 > # > # 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..a6d9a5886 100644 > --- a/lib/librte_sched/rte_sched.c > +++ b/lib/librte_sched/rte_sched.c > @@ -41,6 +41,9 @@ > #define RTE_SCHED_PIPE_INVALID UINT32_MAX > #define RTE_SCHED_BMP_POS_INVALID UINT32_MAX >=20 > +#define RTE_SCHED_QUEUES_PER_PIPE_LOG2 \ > + __builtin_ctz(RTE_SCHED_QUEUES_PER_PIPE) > + > /* Scaling for cycles_per_byte calculation > * Chosen so that minimum rate is 480 bit/sec > */ > @@ -128,22 +131,6 @@ enum grinder_state { > e_GRINDER_READ_MBUF > }; >=20 > -/* > - * 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]; > @@ -228,6 +215,7 @@ struct rte_sched_port { > uint8_t *bmp_array; > struct rte_mbuf **queue_array; > uint8_t memory[0] __rte_cache_aligned; > + > } __rte_cache_aligned; >=20 > enum rte_sched_port_array { > @@ -242,13 +230,11 @@ enum rte_sched_port_array { > }; >=20 > #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 >=20 > static inline uint32_t > @@ -1006,44 +992,56 @@ rte_sched_port_pipe_profile_add(struct > rte_sched_port *port, > return 0; > } >=20 > +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 =3D (subport << __builtin_ctz(port->n_pipes_per_subport)) + > pipe; > + result =3D result * RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE + > traffic_class; > + result =3D 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 > - =3D (struct rte_sched_port_hierarchy *) &pkt->hash.sched; > - > - RTE_BUILD_BUG_ON(sizeof(*sched) > sizeof(pkt->hash.sched)); > - > - sched->color =3D (uint32_t) color; > - sched->subport =3D subport; > - sched->pipe =3D pipe; > - sched->traffic_class =3D traffic_class; > - sched->queue =3D queue; > + uint32_t queue_id =3D rte_sched_port_qindex(port, subport, pipe, > + traffic_class, queue); > + rte_mbuf_sched_set(pkt, queue_id, traffic_class, (uint8_t)color); > } >=20 > 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 > - =3D (const struct rte_sched_port_hierarchy *) &pkt- > >hash.sched; > - > - *subport =3D sched->subport; > - *pipe =3D sched->pipe; > - *traffic_class =3D sched->traffic_class; > - *queue =3D sched->queue; > + uint32_t qid =3D rte_mbuf_sched_queue_read(pkt); > + > + *subport =3D qid >> > + (__builtin_ctz > + (RTE_SCHED_QUEUES_PER_PIPE << > + __builtin_ctz(port->n_pipes_per_subport) > + ) > + ); > + *pipe =3D qid >> RTE_SCHED_QUEUES_PER_PIPE_LOG2; > + *traffic_class =3D rte_mbuf_sched_traffic_class_read(pkt); > + *queue =3D qid & (RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS - 1); > } >=20 > enum rte_meter_color > rte_sched_port_pkt_read_color(const struct rte_mbuf *pkt) > { > - const struct rte_sched_port_hierarchy *sched > - =3D (const struct rte_sched_port_hierarchy *) &pkt- > >hash.sched; > - > - return (enum rte_meter_color) sched->color; > + return (enum rte_meter_color)rte_mbuf_sched_color_read(pkt); > } >=20 > int > @@ -1100,18 +1098,6 @@ rte_sched_queue_read_stats(struct > rte_sched_port *port, > return 0; > } >=20 > -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 =3D subport * port->n_pipes_per_subport + pipe; > - result =3D result * RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE + > traffic_class; > - result =3D result * RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS + queue; > - > - return result; > -} > - > #ifdef RTE_SCHED_DEBUG >=20 > static inline int > @@ -1272,11 +1258,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 =3D rte_mbuf_sched_queue_read(pkt); >=20 > - qindex =3D rte_sched_port_qindex(port, subport, pipe, traffic_class, > queue); > q =3D 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..243efa1d4 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); >=20 > @@ -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); >=20 > diff --git a/test/test/test_sched.c b/test/test/test_sched.c > index 32e500ba9..40e411cab 100644 > --- a/test/test/test_sched.c > +++ b/test/test/test_sched.c > @@ -76,7 +76,7 @@ create_mempool(void) > } >=20 > 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,8 @@ prepare_pkt(struct rte_mbuf *mbuf) > ip_hdr->dst_addr =3D IPv4(0,0,TC,QUEUE); >=20 >=20 > - 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); >=20 > /* 64 byte packet */ > mbuf->pkt_len =3D 60; > @@ -138,7 +139,7 @@ test_sched(void) > for (i =3D 0; i < 10; i++) { > in_mbufs[i] =3D 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]); > } >=20 >=20 > @@ -155,7 +156,7 @@ test_sched(void) > color =3D rte_sched_port_pkt_read_color(out_mbufs[i]); > TEST_ASSERT_EQUAL(color, e_RTE_METER_YELLOW, "Wrong > color\n"); >=20 > - 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); >=20 > TEST_ASSERT_EQUAL(subport, SUBPORT, "Wrong > subport\n"); > -- > 2.17.1