git-lng-odp

git-lng-odp@lists.linaro.org

2 participants
1206 discussions

[COMMIT] branch api-next updated. v1.16.0.0-645-g0980001e

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via 0980001e33b4190133d478a0aa2e718fd1e3c164 (commit) via 297df8bbdd88a2104c6dd0f6c2e506eb5140dd1c (commit) via 32bd7464a8d86b0d83daf1760202dbdc5eabccec (commit) from cf7d38c194f1a9183a524790511de8bfd74a36a9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0980001e33b4190133d478a0aa2e718fd1e3c164 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon Dec 4 14:45:55 2017 +0200 api: tm: remove param-in doxygen tag All parameters are input only (tag [in]) by default. Output parameters are better highlighted, when only those are tagged. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/traffic_mngr.h b/include/odp/api/spec/traffic_mngr.h index c9134e8e..b956f002 100644 --- a/include/odp/api/spec/traffic_mngr.h +++ b/include/odp/api/spec/traffic_mngr.h @@ -484,8 +484,8 @@ typedef struct { * odp_tm_requirements_t record before it is first used or assigned to. * This is done to allow for vendor specific additions to this record. * - * @param[in] requirements A pointer to an odp_tm_requirements_t record which - * is to be initialized. + * @param requirements A pointer to an odp_tm_requirements_t record which + * is to be initialized. */ void odp_tm_requirements_init(odp_tm_requirements_t *requirements); @@ -495,8 +495,8 @@ void odp_tm_requirements_init(odp_tm_requirements_t *requirements); * record before it is first used or assigned to. * This is done to allow for vendor specific additions to this record. * - * @param[in] egress A pointer to an odp_tm_egress_t record which - * is to be initialized. + * @param egress A pointer to an odp_tm_egress_t record which + * is to be initialized. */ void odp_tm_egress_init(odp_tm_egress_t *egress); @@ -518,7 +518,7 @@ void odp_tm_egress_init(odp_tm_egress_t *egress); * * @param[out] capabilities An array of odp_tm_capabilities_t records to * be filled in. - * @param[in] capabilities_size The number of odp_tm_capabilities_t records + * @param capabilities_size The number of odp_tm_capabilities_t records * in the capabilities array. * @return Returns < 0 upon failure. Returns N > 0, * where N is the maximum number of different @@ -531,16 +531,16 @@ int odp_tm_capabilities(odp_tm_capabilities_t capabilities[], /** Create/instantiate a TM Packet Scheduling system. * - * @param[in] name The name to be assigned to this TM system. Cannot - * be NULL, and also must be unique amongst all other - * TM system names. - * @param[in] requirements The minimum required feature set and limits needed - * by the ODP application. - * @param[in] egress Describes the single egress "spigot" of this - * TM system. - * @return Returns ODP_TM_INVALID upon failure, otherwise the - * newly created TM system's odp_tm_t handle is - * returned. + * @param name The name to be assigned to this TM system. Cannot + * be NULL, and also must be unique amongst all other + * TM system names. + * @param requirements The minimum required feature set and limits needed + * by the ODP application. + * @param egress Describes the single egress "spigot" of this + * TM system. + * @return Returns ODP_TM_INVALID upon failure, otherwise the + * newly created TM system's odp_tm_t handle is + * returned. */ odp_tm_t odp_tm_create(const char *name, odp_tm_requirements_t *requirements, @@ -558,21 +558,21 @@ odp_tm_t odp_tm_create(const char *name, * the existing (built-in or created by odp_tm_create) TM system that best * matches the requirements is returned. * - * @param[in] name If NULL then only uses the requirements parameter to - * find a closest match, otherwise if the name is - * matched by an existing TM system it is returned. - * @param[in] requirements Used when the name is NULL (in which case the - * closest match is returned) or when the name is - * not-NULL, but doesn't match any existing TM system - * in which case the requirements is used to find the - * FIRST TM system matching exactly these limits. - * @param[in] egress If a TM system is found, then this specifies the - * egress "spigot" to be associated with this TM - * system. - * @return If an existing TM system (built-in or previously - * created via odp_tm_create) is found, its - * odp_tm_t value is returned, otherwise - * ODP_TM_INVALID is returned. + * @param name If NULL then only uses the requirements parameter to + * find a closest match, otherwise if the name is + * matched by an existing TM system it is returned. + * @param requirements Used when the name is NULL (in which case the + * closest match is returned) or when the name is + * not-NULL, but doesn't match any existing TM system + * in which case the requirements is used to find the + * FIRST TM system matching exactly these limits. + * @param egress If a TM system is found, then this specifies the + * egress "spigot" to be associated with this TM + * system. + * @return If an existing TM system (built-in or previously + * created via odp_tm_create) is found, its + * odp_tm_t value is returned, otherwise + * ODP_TM_INVALID is returned. */ odp_tm_t odp_tm_find(const char *name, odp_tm_requirements_t *requirements, @@ -591,7 +591,7 @@ odp_tm_t odp_tm_find(const char *name, * In addition, ODP TM implementations should fail API requests that "exceed" * the limits or features contracted for in the requirements. * - * @param[in] odp_tm The odp_tm_t value of the TM system to be + * @param odp_tm The odp_tm_t value of the TM system to be * queried. * @param[out] capabilities A pointer to an odp_tm_capabilities_t record * where the actual limits used by the TM system are @@ -619,9 +619,9 @@ int odp_tm_capability(odp_tm_t odp_tm, odp_tm_capabilities_t *capabilities); * TM system, other than EVENTUALLY these packets will be either sent (in ANY * order) or freed. * - * @param[in] odp_tm The odp_tm_t value of the TM system to be destroyed (and - * hence destroyed (and hence freed). - * @return 0 upon success, < 0 upon failure. + * @param odp_tm The odp_tm_t value of the TM system to be destroyed (and + * hence destroyed (and hence freed). + * @return 0 upon success, < 0 upon failure. */ int odp_tm_destroy(odp_tm_t odp_tm); @@ -640,13 +640,13 @@ int odp_tm_destroy(odp_tm_t odp_tm); * calls to this function with drop_eligible_enabled == FALSE - i.e. must * always return 0 when disabling this feature. * - * @param[in] odp_tm Odp_tm is used to identify the TM system - * whose egress behavior is being changed. - * @param[in] color The packet color whose egress marking is - * being changed. - * @param[in] drop_eligible_enabled If true then will set the DEI bit for - * egressed VLAN tagged pkts with this color. - * @return 0 upon success, < 0 upon failure. + * @param odp_tm Odp_tm is used to identify the TM system + * whose egress behavior is being changed. + * @param color The packet color whose egress marking is + * being changed. + * @param drop_eligible_enabled If true then will set the DEI bit for + * egressed VLAN tagged pkts with this color. + * @return 0 upon success, < 0 upon failure. */ int odp_tm_vlan_marking(odp_tm_t odp_tm, odp_packet_color_t color, @@ -669,16 +669,16 @@ int odp_tm_vlan_marking(odp_tm_t odp_tm, * calls to this function with ecn_ce_enabled == FALSE - i.e. must always * return 0 when disabling this feature. * - * @param[in] odp_tm Odp_tm is used to identify the TM system whose - * egress behavior is being changed. - * @param[in] color The packet color whose egress marking is - * being changed. - * @param[in] ecn_ce_enabled If true then egressed IPv4/IPv6 pkts whose - * protocol field is TCP AND whose ECN subfield has - * either one of the two values 1 or 2, will set this - * subfield to the value ECN_CE - i.e. Congestion - * Experienced (whose value is 3). - * @return 0 upon success, < 0 upon failure. + * @param odp_tm Odp_tm is used to identify the TM system whose + * egress behavior is being changed. + * @param color The packet color whose egress marking is + * being changed. + * @param ecn_ce_enabled If true then egressed IPv4/IPv6 pkts whose + * protocol field is TCP AND whose ECN subfield has + * either one of the two values 1 or 2, will set this + * subfield to the value ECN_CE - i.e. Congestion + * Experienced (whose value is 3). + * @return 0 upon success, < 0 upon failure. */ int odp_tm_ecn_marking(odp_tm_t odp_tm, odp_packet_color_t color, @@ -709,15 +709,15 @@ int odp_tm_ecn_marking(odp_tm_t odp_tm, * calls to this function with drop_prec_enabled == FALSE - i.e. must always * return 0 when disabling this feature. * - * @param[in] odp_tm Odp_tm is used to identify the TM system whose - * egress behavior is being changed. - * @param[in] color The packet color whose egress marking is - * being changed. - * @param[in] drop_prec_enabled If true then egressed IPv4/IPv6 pkts with this - * color will have the pkt's Drop Precedence - * sub-subfield of the DSCP subfield set to - * LOW, MEDIUM or HIGH drop precedence. - * @return 0 upon success, < 0 upon failure. + * @param odp_tm Odp_tm is used to identify the TM system whose + * egress behavior is being changed. + * @param color The packet color whose egress marking is + * being changed. + * @param drop_prec_enabled If true then egressed IPv4/IPv6 pkts with this + * color will have the pkt's Drop Precedence + * sub-subfield of the DSCP subfield set to + * LOW, MEDIUM or HIGH drop precedence. + * @return 0 upon success, < 0 upon failure. */ int odp_tm_drop_prec_marking(odp_tm_t odp_tm, odp_packet_color_t color, @@ -785,8 +785,8 @@ typedef struct { /** odp_tm_shaper_params_init() must be called to initialize any * odp_tm_shaper_params_t record before it is first used or assigned to. * - * @param[in] params A pointer to an odp_tm_shaper_params_t record which - * is to be initialized. + * @param params A pointer to an odp_tm_shaper_params_t record which + * is to be initialized. */ void odp_tm_shaper_params_init(odp_tm_shaper_params_t *params); @@ -794,14 +794,14 @@ void odp_tm_shaper_params_init(odp_tm_shaper_params_t *params); * subsequently be attached to any number (including zero) of tm_queues * or tm_nodes. * - * @param[in] name Optional name associated with this shaper profile. Can - * be NULL. If non-NULL must be unique amongst the set of - * all other shaper profiles. - * @param[in] params The profile parameters. See comments associated with - * the odp_tm_shaper_params_t for more details. - * @return Returns ODP_TM_INVALID upon failure, or the newly - * allocated odp_tm_shaper_t value representing this - * profile object. + * @param name Optional name associated with this shaper profile. Can + * be NULL. If non-NULL must be unique amongst the set of + * all other shaper profiles. + * @param params The profile parameters. See comments associated with + * the odp_tm_shaper_params_t for more details. + * @return Returns ODP_TM_INVALID upon failure, or the newly + * allocated odp_tm_shaper_t value representing this + * profile object. */ odp_tm_shaper_t odp_tm_shaper_create(const char *name, odp_tm_shaper_params_t *params); @@ -812,9 +812,9 @@ odp_tm_shaper_t odp_tm_shaper_create(const char *name, * profile object. It is an error if this shaper profile is still being * referenced by an active (connected) tm_node. * - * @param[in] shaper_profile Specifies the shaper profile object which is - * being destroyed. - * @return Returns < 0 upon failure or 0 upon success. + * @param shaper_profile Specifies the shaper profile object which is + * being destroyed. + * @return Returns < 0 upon failure or 0 upon success. */ int odp_tm_shaper_destroy(odp_tm_shaper_t shaper_profile); @@ -822,7 +822,7 @@ int odp_tm_shaper_destroy(odp_tm_shaper_t shaper_profile); * with the specified shaper profile object, and copies them into the supplied * record. * - * @param[in] shaper_profile Specifies the shaper profile object whose + * @param shaper_profile Specifies the shaper profile object whose * values are to be read. * @param[out] params A pointer to an odp_tm_shaper_params_t record * where the current shaper profile object values @@ -837,12 +837,12 @@ int odp_tm_shaper_params_read(odp_tm_shaper_t shaper_profile, * effect that all tm_input's and tm_nodes that are associated (attached?) * with this shaper profile object will be updated with the new values. * - * @param[in] shaper_profile Specifies the shaper profile object whose - * values are to be set. - * @param[in] params A pointer to an odp_tm_shaper_params_t record - * where the new shaper profile object values - * are taken from. - * @return Returns < 0 upon failure or 0 upon success. + * @param shaper_profile Specifies the shaper profile object whose + * values are to be set. + * @param params A pointer to an odp_tm_shaper_params_t record + * where the new shaper profile object values + * are taken from. + * @return Returns < 0 upon failure or 0 upon success. */ int odp_tm_shaper_params_update(odp_tm_shaper_t shaper_profile, odp_tm_shaper_params_t *params); @@ -850,10 +850,10 @@ int odp_tm_shaper_params_update(odp_tm_shaper_t shaper_profile, /** odp_tm_shaper_lookup() can be used to find the shaper profile object * created with the specified name. * - * @param[in] name Name of a previously created shaper profile. Cannot be - * NULL. - * @return Returns ODP_TM_INVALID upon failure, or the shaper - * profile handle created with this name. + * @param name Name of a previously created shaper profile. Cannot be NULL. + * + * @return Returns ODP_TM_INVALID upon failure, or the shaper + * profile handle created with this name. */ odp_tm_shaper_t odp_tm_shaper_lookup(const char *name); @@ -896,22 +896,22 @@ typedef struct { /** odp_tm_sched_params_init() must be called to initialize any * odp_tm_sched_params_t record before it is first used or assigned to. * - * @param[in] params A pointer to an odp_tm_sched_params_t record which - * is to be initialized. + * @param params A pointer to an odp_tm_sched_params_t record which + * is to be initialized. */ void odp_tm_sched_params_init(odp_tm_sched_params_t *params); /** odp_tm_sched_create() creates a scheduler profile object, which can * subsequently be attached to any number (including zero) of tm_nodes. * - * @param[in] name Optional name associated with this scheduler profile. - * Can be NULL. If non-NULL must be unique amongst the - * set of all other scheduler profiles. - * @param[in] params The profile parameters. See comments associated with - * the odp_tm_sched_params_t for more details. - * @return Returns ODP_TM_INVALID upon failure, or the newly - * allocated odp_tm_sched_t value representing this profile - * object. + * @param name Optional name associated with this scheduler profile. + * Can be NULL. If non-NULL must be unique amongst the + * set of all other scheduler profiles. + * @param params The profile parameters. See comments associated with + * the odp_tm_sched_params_t for more details. + * @return Returns ODP_TM_INVALID upon failure, or the newly + * allocated odp_tm_sched_t value representing this profile + * object. */ odp_tm_sched_t odp_tm_sched_create(const char *name, odp_tm_sched_params_t *params); @@ -922,9 +922,9 @@ odp_tm_sched_t odp_tm_sched_create(const char *name, * profile object. It is an error if this scheduler profile is still being * referenced by an active (connected) tm_node. * - * @param[in] sched_profile Specifies the shaper profile object which is - * being destroyed. - * @return Returns < 0 upon failure or 0 upon success. + * @param sched_profile Specifies the shaper profile object which is + * being destroyed. + * @return Returns < 0 upon failure or 0 upon success. */ int odp_tm_sched_destroy(odp_tm_sched_t sched_profile); @@ -932,7 +932,7 @@ int odp_tm_sched_destroy(odp_tm_sched_t sched_profile); * with the specified scheduler profile object, and copies them into the * supplied record. * - * @param[in] sched_profile Specifies the scheduler profile whose values + * @param sched_profile Specifies the scheduler profile whose values * are to be read. * @param[out] params A pointer to an odp_tm_sched_params_t record * where the current scheduler profile object @@ -947,12 +947,12 @@ int odp_tm_sched_params_read(odp_tm_sched_t sched_profile, * the effect that all tm_nodes that are associated (attached?) with this * Scheduler profile object will be updated with the new values. * - * @param[in] sched_profile Specifies the Scheduler profile object whose - * values are to be set. - * @param[in] params A pointer to an odp_tm_sched_params_t record - * where the new scheduler profile object values - * are taken from. - * @return Returns < 0 upon failure or 0 upon success. + * @param sched_profile Specifies the Scheduler profile object whose + * values are to be set. + * @param params A pointer to an odp_tm_sched_params_t record + * where the new scheduler profile object values + * are taken from. + * @return Returns < 0 upon failure or 0 upon success. */ int odp_tm_sched_params_update(odp_tm_sched_t sched_profile, odp_tm_sched_params_t *params); @@ -960,10 +960,10 @@ int odp_tm_sched_params_update(odp_tm_sched_t sched_profile, /** odp_tm_sched_lookup() can be used to find the scheduler profile object * created with the specified name. * - * @param[in] name Name of a previously created scheduler profile. Cannot be - * NULL. - * @return Returns ODP_TM_INVALID upon failure, or the scheduler - * profile handle created with this name. + * @param name Name of a previously created scheduler profile. Cannot be NULL. + * + * @return Returns ODP_TM_INVALID upon failure, or the scheduler + * profile handle created with this name. */ odp_tm_sched_t odp_tm_sched_lookup(const char *name); @@ -985,8 +985,8 @@ typedef struct { /** odp_tm_threshold_params_init() must be called to initialize any * odp_tm_threshold_params_t record before it is first used or assigned to. * - * @param[in] params A pointer to an odp_tm_threshold_params_t record which - * is to be initialized. + * @param params A pointer to an odp_tm_threshold_params_t record which + * is to be initialized. */ void odp_tm_threshold_params_init(odp_tm_threshold_params_t *params); @@ -994,14 +994,14 @@ void odp_tm_threshold_params_init(odp_tm_threshold_params_t *params); * can subsequently be attached to any number (including zero) of tm_queues or * tm_nodes. * - * @param[in] name Optional name associated with this queue threshold - * profile. Can be NULL. If non-NULL must be unique - * amongst the set of all other queue threshold profiles. - * @param[in] params The profile parameters. See comments associated with - * the odp_tm_threshold_params_t for more details. - * @return Returns ODP_TM_INVALID upon failure, or the newly - * allocated odp_tm_threshold_t value representing this - * profile object. + * @param name Optional name associated with this queue threshold + * profile. Can be NULL. If non-NULL must be unique + * amongst the set of all other queue threshold profiles. + * @param params The profile parameters. See comments associated with + * the odp_tm_threshold_params_t for more details. + * @return Returns ODP_TM_INVALID upon failure, or the newly + * allocated odp_tm_threshold_t value representing this + * profile object. */ odp_tm_threshold_t odp_tm_threshold_create(const char *name, odp_tm_threshold_params_t *params); @@ -1012,9 +1012,9 @@ odp_tm_threshold_t odp_tm_threshold_create(const char *name, * profile object. It is an error if this threshold profile is still being * referenced by an active (connected) tm_queue or tm_node. * - * @param[in] threshold_profile Specifies the queue thresholds profile - * object which is being destroyed. - * @return Returns < 0 upon failure or 0 upon success. + * @param threshold_profile Specifies the queue thresholds profile + * object which is being destroyed. + * @return Returns < 0 upon failure or 0 upon success. */ int odp_tm_threshold_destroy(odp_tm_threshold_t threshold_profile); @@ -1022,7 +1022,7 @@ int odp_tm_threshold_destroy(odp_tm_threshold_t threshold_profile); * with the specified queue thresholds profile object, and copies them into the * supplied record. * - * @param[in] threshold_profile Specifies the queue thresholds profile + * @param threshold_profile Specifies the queue thresholds profile * object whose values are to be read. * @param[out] params A pointer to an odp_tm_threshold_params_t * record where the current queue thresholds @@ -1038,12 +1038,12 @@ int odp_tm_thresholds_params_read(odp_tm_threshold_t threshold_profile, * associated (attached?) with this queue thresholds profile object will be * updated with the new values. * - * @param[in] threshold_profile Specifies the queue thresholds profile - * object whose values are to be set. - * @param[in] params A pointer to an odp_tm_threshold_params_t - * record where the current queue thresholds - * profile object values are taken from. - * @return Returns < 0 upon failure or 0 upon success. + * @param threshold_profile Specifies the queue thresholds profile + * object whose values are to be set. + * @param params A pointer to an odp_tm_threshold_params_t + * record where the current queue thresholds + * profile object values are taken from. + * @return Returns < 0 upon failure or 0 upon success. */ int odp_tm_thresholds_params_update(odp_tm_threshold_t threshold_profile, odp_tm_threshold_params_t *params); @@ -1051,10 +1051,10 @@ int odp_tm_thresholds_params_update(odp_tm_threshold_t threshold_profile, /** odp_tm_thresholds_lookup() can be used to find the queue thresholds * profile object created with the specified name. * - * @param[in] name Name of a previously created queue thresholds profile. - * Cannot be NULL. - * @return Returns ODP_TM_INVALID upon failure, or the queue - * thresholds profile handle created with this name. + * @param name Name of a previously created queue thresholds profile. + * Cannot be NULL. + * @return Returns ODP_TM_INVALID upon failure, or the queue + * thresholds profile handle created with this name. */ odp_tm_threshold_t odp_tm_thresholds_lookup(const char *name); @@ -1121,8 +1121,8 @@ typedef struct { /** odp_tm_wred_params_init() must be called to initialize any * odp_tm_wred_params_t record before it is first used or assigned to. * - * @param[in] params A pointer to an odp_tm_wred_params_t record which - * is to be initialized. + * @param params A pointer to an odp_tm_wred_params_t record which + * is to be initialized. */ void odp_tm_wred_params_init(odp_tm_wred_params_t *params); @@ -1130,14 +1130,14 @@ void odp_tm_wred_params_init(odp_tm_wred_params_t *params); * profile object, which can subsequently be attached to any number (including * zero) of tm_queues or tm_nodes. * - * @param[in] name Optional name associated with this WRED profile. Can - * be NULL. If non-NULL must be unique amongst the set of - * all other WRED profiles. - * @param[in] params The profile parameters. See comments associated with the - * odp_tm_wred_params_t for more details. - * @return Returns ODP_TM_INVALID upon failure, or the newly - * allocated odp_tm_wred_t value representing this profile - * object. + * @param name Optional name associated with this WRED profile. Can + * be NULL. If non-NULL must be unique amongst the set of + * all other WRED profiles. + * @param params The profile parameters. See comments associated with the + * odp_tm_wred_params_t for more details. + * @return Returns ODP_TM_INVALID upon failure, or the newly + * allocated odp_tm_wred_t value representing this profile + * object. */ odp_tm_wred_t odp_tm_wred_create(const char *name, odp_tm_wred_params_t *params); @@ -1148,9 +1148,9 @@ odp_tm_wred_t odp_tm_wred_create(const char *name, * profile object. It is an error if this profile object is still being * referenced by an active (connected) tm_node. * - * @param[in] wred_profile Specifies the WRED profile object which is - * being destroyed. - * @return Returns < 0 upon failure or 0 upon success. + * @param wred_profile Specifies the WRED profile object which is + * being destroyed. + * @return Returns < 0 upon failure or 0 upon success. */ int odp_tm_wred_destroy(odp_tm_wred_t wred_profile); @@ -1158,7 +1158,7 @@ int odp_tm_wred_destroy(odp_tm_wred_t wred_profile); * with the specified WRED profile object, and copies them into the supplied * record. * - * @param[in] wred_profile Specifies the WRED profile object whose + * @param wred_profile Specifies the WRED profile object whose * values are to be read. * @param[out] params A pointer to an odp_tm_wred_params_t record * where the current WRED profile object values @@ -1173,12 +1173,12 @@ int odp_tm_wred_params_read(odp_tm_wred_t wred_profile, * effect that all tm_input's and tm_nodes that are associated (attached?) * with this WRED profile object will be updated with the new values. * - * @param[in] wred_profile Specifies the WRED profile object whose - * values are to be set. - * @param[in] params A pointer to an odp_tm_wred_params_t record - * where the new WRED profile object values - * are taken from. - * @return Returns < 0 upon failure or 0 upon success. + * @param wred_profile Specifies the WRED profile object whose + * values are to be set. + * @param params A pointer to an odp_tm_wred_params_t record + * where the new WRED profile object values + * are taken from. + * @return Returns < 0 upon failure or 0 upon success. */ int odp_tm_wred_params_update(odp_tm_wred_t wred_profile, odp_tm_wred_params_t *params); @@ -1186,10 +1186,10 @@ int odp_tm_wred_params_update(odp_tm_wred_t wred_profile, /** odp_tm_wred_lookup() can be used to find the WRED profile object created * with the specified name. * - * @param[in] name Name of a previously created WRED profile. Cannot be - * NULL. - * @return Returns ODP_TM_INVALID upon failure, or the WRED - * profile handle created with this name. + * @param name Name of a previously created WRED profile. Cannot be NULL. + * + * @return Returns ODP_TM_INVALID upon failure, or the WRED + * profile handle created with this name. */ odp_tm_wred_t odp_tm_wred_lookup(const char *name); @@ -1237,8 +1237,8 @@ typedef struct { /** odp_tm_node_params_init() must be called to initialize any * odp_tm_node_params_t record before it is first used or assigned to. * - * @param[in] params A pointer to an odp_tm_node_params_t record which - * is to be initialized. + * @param params A pointer to an odp_tm_node_params_t record which + * is to be initialized. */ void odp_tm_node_params_init(odp_tm_node_params_t *params); @@ -1249,15 +1249,15 @@ void odp_tm_node_params_init(odp_tm_node_params_t *params); * strict priority levels for an tm_node cannot be changed after tm_node * creation. The level parameter MUST be in the range 0..max_level - 1. * - * @param[in] odp_tm Odp_tm is used to identify the TM system into which this - * odp_tm_node object is created. - * @param[in] name Optional name that can be used later later to find this - * same odp_tm_node_t. Can be NULL, otherwise must be - * unique across all odp_tm_node objects. - * @param[in] params A pointer to a record holding (an extensible) set of - * properties/attributes of this tm_node. - * @return Returns ODP_TM_INVALID upon failure, otherwise returns - * a valid odp_tm_node_t handle if successful. + * @param odp_tm Odp_tm is used to identify the TM system into which this + * odp_tm_node object is created. + * @param name Optional name that can be used later later to find this + * same odp_tm_node_t. Can be NULL, otherwise must be + * unique across all odp_tm_node objects. + * @param params A pointer to a record holding (an extensible) set of + * properties/attributes of this tm_node. + * @return Returns ODP_TM_INVALID upon failure, otherwise returns + * a valid odp_tm_node_t handle if successful. */ odp_tm_node_t odp_tm_node_create(odp_tm_t odp_tm, const char *name, @@ -1268,21 +1268,21 @@ odp_tm_node_t odp_tm_node_create(odp_tm_t odp_tm, * The odp_tm_node_destroy frees the resources used by a tm_node_t object. * The tm_node to be destroyed MUST not have any parent or child entities. * - * @param[in] tm_node Specifies the tm_node to be destroyed (freed). - * @return Returns -1 upon failure, 0 upon success. + * @param tm_node Specifies the tm_node to be destroyed (freed). + * @return Returns -1 upon failure, 0 upon success. */ int odp_tm_node_destroy(odp_tm_node_t tm_node); /** The odp_tm_node_shaper_config() function is used to dynamically set or * change the shaper profile associated with this tm_node. * - * @param[in] tm_node Specifies the tm_node to be changed. - * @param[in] shaper_profile Specifies the shaper profile that should - * now be used for the shaper entity within the - * given tm_node. Note that it is legal to specify - * ODP_TM_INVALID indicating that this tm_node - * no longer implements a shaper function. - * @return Returns 0 upon success and < 0 upon failure. + * @param tm_node Specifies the tm_node to be changed. + * @param shaper_profile Specifies the shaper profile that should + * now be used for the shaper entity within the + * given tm_node. Note that it is legal to specify + * ODP_TM_INVALID indicating that this tm_node + * no longer implements a shaper function. + * @return Returns 0 upon success and < 0 upon failure. */ int odp_tm_node_shaper_config(odp_tm_node_t tm_node, odp_tm_shaper_t shaper_profile); @@ -1290,15 +1290,15 @@ int odp_tm_node_shaper_config(odp_tm_node_t tm_node, /** The odp_tm_node_sched_config() function is used to dynamically set or * change the scheduler profile associated with a tm_node. * - * @param[in] tm_node Specifies the tm_node to be changed. - * @param[in] tm_fan_in_node Specifies which of the specified tm_node's - * fan-in's weights etc are to be changed. The - * fan-in is identified by the "producer"/parent - * tm_node actually connected to this fan-in. - * @param[in] sched_profile Specifies the scheduler profile that should - * now be used for the WFQ/RR entity within the - * given tm_node. - * @return Returns 0 upon success and < 0 upon failure. + * @param tm_node Specifies the tm_node to be changed. + * @param tm_fan_in_node Specifies which of the specified tm_node's + * fan-in's weights etc are to be changed. The + * fan-in is identified by the "producer"/parent + * tm_node actually connected to this fan-in. + * @param sched_profile Specifies the scheduler profile that should + * now be used for the WFQ/RR entity within the + * given tm_node. + * @return Returns 0 upon success and < 0 upon failure. */ int odp_tm_node_sched_config(odp_tm_node_t tm_node, odp_tm_node_t tm_fan_in_node, @@ -1307,10 +1307,10 @@ int odp_tm_node_sched_config(odp_tm_node_t tm_node, /** The odp_tm_node_threshold_config() function is used to dynamically set or * change the queue threshold profile associated with this tm_node. * - * @param[in] tm_node Specifies the tm_node to be changed. - * @param[in] thresholds_profile Specifies the queue threshold profile that - * should now be used for the given tm_node. - * @return Returns 0 upon success and < 0 upon failure. + * @param tm_node Specifies the tm_node to be changed. + * @param thresholds_profile Specifies the queue threshold profile that + * should now be used for the given tm_node. + * @return Returns 0 upon success and < 0 upon failure. */ int odp_tm_node_threshold_config(odp_tm_node_t tm_node, odp_tm_threshold_t thresholds_profile); @@ -1319,16 +1319,16 @@ int odp_tm_node_threshold_config(odp_tm_node_t tm_node, * change the WRED profile associated with this tm_node or tm_node/pkt_color * combination. * - * @param[in] tm_node Specifies the tm_node to be changed. - * @param[in] pkt_color Specifies the pkt_color that this profile is to be - * used with. Can also be the special value - * ALL_PKT_COLORS. - * @param[in] wred_profile Specifies the WRED profile that should now be used - * by this tm_queue, when processing pkts of this - * pkt_color. It can be the value ODP_TM_INVALID - * indicating that this tm_queue/pkt_color combination - * no longer implements WRED. - * @return Returns 0 upon success and < 0 upon failure. + * @param tm_node Specifies the tm_node to be changed. + * @param pkt_color Specifies the pkt_color that this profile is to be + * used with. Can also be the special value + * ALL_PKT_COLORS. + * @param wred_profile Specifies the WRED profile that should now be used + * by this tm_queue, when processing pkts of this + * pkt_color. It can be the value ODP_TM_INVALID + * indicating that this tm_queue/pkt_color combination + * no longer implements WRED. + * @return Returns 0 upon success and < 0 upon failure. */ int odp_tm_node_wred_config(odp_tm_node_t tm_node, odp_packet_color_t pkt_color, @@ -1337,34 +1337,33 @@ int odp_tm_node_wred_config(odp_tm_node_t tm_node, /** odp_tm_node_lookup() can be used to find the tm_node object created with * the specified name. * - * @param[in] odp_tm Odp_tm is used to identify the TM system into which this - * odp_tm_node object is created. - * @param[in] name Name of a previously created tm_node. Cannot be - * NULL. - * @return Returns ODP_TM_INVALID upon failure, or the tm_node - * handle created with this name. + * @param odp_tm Odp_tm is used to identify the TM system into which this + * odp_tm_node object is created. + * @param name Name of a previously created tm_node. Cannot be NULL. + * + * @return Returns ODP_TM_INVALID upon failure, or the tm_node + * handle created with this name. */ odp_tm_node_t odp_tm_node_lookup(odp_tm_t odp_tm, const char *name); /** odp_tm_node_context() can be used to get the user_context value that is * associated with the given tm_node. * - * @param[in] tm_node Specifies the tm_node whose user_context is to be gotten. - * @return Returns the user_context pointer associated with this - * tm_node. Returns NULL if the tm_node is not valid OR - * if the user_context was NLL. - * handle created with this name. + * @param tm_node Specifies the tm_node whose user_context is to be gotten. + * @return Returns the user_context pointer associated with this + * tm_node. Returns NULL if the tm_node is not valid OR + * if the user_context was NULL. */ void *odp_tm_node_context(odp_tm_node_t tm_node); /** odp_tm_node_context_set() can be used to set the user_context value that is * associated with the given tm_node. * - * @param[in] tm_node Specifies the tm_node whose user_context is to be set. - * @param[in] user_context Generic pointer associated with the given tm_node. - * Does not have any effect on the tm_node semantics. - * @return Returns 0 upon success and -1 if the given tm_node - * is not valid. + * @param tm_node Specifies the tm_node whose user_context is to be set. + * @param user_context Generic pointer associated with the given tm_node. + * Does not have any effect on the tm_node semantics. + * @return Returns 0 upon success and -1 if the given tm_node + * is not valid. */ int odp_tm_node_context_set(odp_tm_node_t tm_node, void *user_context); @@ -1406,8 +1405,8 @@ typedef struct { /** odp_tm_queue_params_init() must be called to initialize any * odp_tm_queue_params_t record before it is first used or assigned to. * - * @param[in] params A pointer to an odp_tm_queue_params_t record which - * is to be initialized. + * @param params A pointer to an odp_tm_queue_params_t record which + * is to be initialized. */ void odp_tm_queue_params_init(odp_tm_queue_params_t *params); @@ -1419,12 +1418,12 @@ void odp_tm_queue_params_init(odp_tm_queue_params_t *params); * number of buffers and instead limit the queue memory usage by buffer counts * versus strictly using byte counts. * - * @param[in] odp_tm Odp_tm is used to identify the TM system into which this - * odp_tm_queue object is created. - * @param[in] params A pointer to a record holding (an extensible) set of - * properties/attributes of this tm_queue. - * @return Returns ODP_TM_INVALID upon failure, otherwise a valid - * odp_tm_queue_t handle. + * @param odp_tm Odp_tm is used to identify the TM system into which this + * odp_tm_queue object is created. + * @param params A pointer to a record holding (an extensible) set of + * properties/attributes of this tm_queue. + * @return Returns ODP_TM_INVALID upon failure, otherwise a valid + * odp_tm_queue_t handle. */ odp_tm_queue_t odp_tm_queue_create(odp_tm_t odp_tm, odp_tm_queue_params_t *params); @@ -1433,44 +1432,43 @@ odp_tm_queue_t odp_tm_queue_create(odp_tm_t odp_tm, * used by a tm_queue_t object. The tm_queue to be destroyed MUST not be * connected in a tm system, and consequently cannot contain any pkts. * - * @param[in] tm_queue Specifies the tm_queue to be destroyed (freed). - * @return Returns -1 upon failure, 0 upon success. + * @param tm_queue Specifies the tm_queue to be destroyed (freed). + * @return Returns -1 upon failure, 0 upon success. */ int odp_tm_queue_destroy(odp_tm_queue_t tm_queue); /** odp_tm_queue_context() can be used to get the user_context value that is * associated with the given tm_queue. * - * @param[in] tm_queue Specifies the tm_queue whose user_context is to be - * returned. - * @return Returns the user_context pointer associated with this - * tm_queue. Returns NULL if the tm_quue is not valid OR - * if the user_context was NULL. + * @param tm_queue Specifies the tm_queue whose user_context is to be + * returned. + * @return Returns the user_context pointer associated with this + * tm_queue. Returns NULL if the tm_quue is not valid OR + * if the user_context was NULL. */ void *odp_tm_queue_context(odp_tm_queue_t tm_queue); /** odp_tm_queue_context_set() can be used to set the user_context value that is * associated with the given tm_queue. * - * @param[in] tm_queue Specifies the tm_queue whose user_context is to be - * set. - * @param[in] user_context Generic pointer associated with the given tm_queue. - * Does not have any effect on the tm_queue semantics. - * @return Returns 0 upon success and -1 if the given tm_queu - * is not valid. + * @param tm_queue Specifies the tm_queue whose user_context is to be set. + * @param user_context Generic pointer associated with the given tm_queue. + * Does not have any effect on the tm_queue semantics. + * @return Returns 0 upon success and -1 if the given tm_queue + * is not valid. */ int odp_tm_queue_context_set(odp_tm_queue_t tm_queue, void *user_context); /** The odp_tm_queue_shaper_config() function is used to dynamically set * or change the shaper profile associated with this tm_queue. * - * @param[in] tm_queue Specifies the tm_queue to be changed. - * @param[in] shaper_profile Specifies the shaper profile that should now be - * used for shaping the tm_queue's packet stream. - * Note that it is legal to specify ODP_TM_INVALID - * indicating that this tm_queue no longer - * implements a shaper function. - * @return Returns 0 upon success and < 0 upon failure. + * @param tm_queue Specifies the tm_queue to be changed. + * @param shaper_profile Specifies the shaper profile that should now be + * used for shaping the tm_queue's packet stream. + * Note that it is legal to specify ODP_TM_INVALID + * indicating that this tm_queue no longer + * implements a shaper function. + * @return Returns 0 upon success and < 0 upon failure. */ int odp_tm_queue_shaper_config(odp_tm_queue_t tm_queue, odp_tm_shaper_t shaper_profile); @@ -1480,15 +1478,15 @@ int odp_tm_queue_shaper_config(odp_tm_queue_t tm_queue, * the name, this function affects a tm_node scheduler - specifically the * scheduler fan-in when such fan-in comes from an tm_queue. * - * @param[in] tm_node Specifies the tm_node to be changed. - * @param[in] tm_fan_in_queue Specifies which of the specified tm_node's - * fan-in's weights etc are to be changed. The - * fan-in is identified by the "producer"/parent - * tm_queue actually connected to this fan-in. - * @param[in] sched_profile Specifies the scheduler profile that should - * now be used for the WFQ/RR entity within the - * given tm_node. - * @return Returns 0 upon success and < 0 upon failure. + * @param tm_node Specifies the tm_node to be changed. + * @param tm_fan_in_queue Specifies which of the specified tm_node's + * fan-in's weights etc are to be changed. The + * fan-in is identified by the "producer"/parent + * tm_queue actually connected to this fan-in. + * @param sched_profile Specifies the scheduler profile that should + * now be used for the WFQ/RR entity within the + * given tm_node. + * @return Returns 0 upon success and < 0 upon failure. */ int odp_tm_queue_sched_config(odp_tm_node_t tm_node, odp_tm_queue_t tm_fan_in_queue, @@ -1497,10 +1495,10 @@ int odp_tm_queue_sched_config(odp_tm_node_t tm_node, /** The odp_tm_queue_threshold_config() function is used to dynamically set or * change the queue threshold profile associated with this tm_queue. * - * @param[in] tm_queue Specifies the tm_queue to be changed. - * @param[in] thresholds_profile Specifies the queue threshold profile that - * should now be used for the given tm_queue. - * @return Returns 0 upon success and < 0 upon failure. + * @param tm_queue Specifies the tm_queue to be changed. + * @param thresholds_profile Specifies the queue threshold profile that + * should now be used for the given tm_queue. + * @return Returns 0 upon success and < 0 upon failure. */ int odp_tm_queue_threshold_config(odp_tm_queue_t tm_queue, odp_tm_threshold_t thresholds_profile); @@ -1509,16 +1507,16 @@ int odp_tm_queue_threshold_config(odp_tm_queue_t tm_queue, * the WRED profile associated with this tm_queue or tm_queue/pkt_color * combination. * - * @param[in] tm_queue Specifies the tm_queue to be changed. - * @param[in] pkt_color Specifies the pkt_color that this profile is to be - * used with. Can also be the special value - * ALL_PKT_COLORS. - * @param[in] wred_profile Specifies the WRED profile that should now be used - * by this tm_queue, when processing pkts of this - * pkt_color. It can be the value ODP_TM_INVALID - * indicating that this tm_queue/pkt_color combination - * no longer implements WRED. - * @return Returns 0 upon success and < 0 upon failure. + * @param tm_queue Specifies the tm_queue to be changed. + * @param pkt_color Specifies the pkt_color that this profile is to be + * used with. Can also be the special value + * ALL_PKT_COLORS. + * @param wred_profile Specifies the WRED profile that should now be used + * by this tm_queue, when processing pkts of this + * pkt_color. It can be the value ODP_TM_INVALID + * indicating that this tm_queue/pkt_color combination + * no longer implements WRED. + * @return Returns 0 upon success and < 0 upon failure. */ int odp_tm_queue_wred_config(odp_tm_queue_t tm_queue, odp_packet_color_t pkt_color, @@ -1532,14 +1530,14 @@ int odp_tm_queue_wred_config(odp_tm_queue_t tm_queue, * dst_tm_node. Note that an ODP_TM_ROOT handle passed in for the * dst_tm_node implies connection to the egress/root object of this TM system. * - * @param[in] src_tm_node odp_tm_node_t handle of the tm_node whose output is - * to be connected to the fan-in of the next tm_node - * as represented by the dst_tm_node. - * @param[in] dst_tm_node odp_tm_node_t handle of the tm_node object that will - * receive all of the pkt_descs from the src tm_node - * output. If ODP_TM_ROOT, then attachment is to - * the root egress object/spigot. - * @return 0 upon success, < 0 on failure. + * @param src_tm_node odp_tm_node_t handle of the tm_node whose output is + * to be connected to the fan-in of the next tm_node + * as represented by the dst_tm_node. + * @param dst_tm_node odp_tm_node_t handle of the tm_node object that will + * receive all of the pkt_descs from the src tm_node + * output. If ODP_TM_ROOT, then attachment is to + * the root egress object/spigot. + * @return 0 upon success, < 0 on failure. */ int odp_tm_node_connect(odp_tm_node_t src_tm_node, odp_tm_node_t dst_tm_node); @@ -1550,11 +1548,10 @@ int odp_tm_node_connect(odp_tm_node_t src_tm_node, odp_tm_node_t dst_tm_node); * tm_queue to be in the fanin tree (directly or indirectly) of this tm_node. * Note that it is legal for this tm_node to no fanout connection. * - * @param[in] src_tm_node odp_tm_node_t handle of the tm_node whose output is - * to be disconnected from the fan-in of the next - * tm_node. + * @param src_tm_node odp_tm_node_t handle of the tm_node whose output is + * to be disconnected from the fan-in of the next tm_node. * - * @return 0 upon success, < 0 on failure. + * @return 0 upon success, < 0 on failure. */ int odp_tm_node_disconnect(odp_tm_node_t src_tm_node); @@ -1562,12 +1559,12 @@ int odp_tm_node_disconnect(odp_tm_node_t src_tm_node); * parent tm_node or to the egress/root node. The tm_queue will then become * one of the dst node's fan-in set. * - * @param[in] tm_queue Specifies the tm_queue. - * @param[in] dst_tm_node odp_tm_node_t handle of the tm_node object that will - * receive all of the pkt_descs from the src tm_node - * output. If ODP_TM_ROOT, then attachment is to - * the root egress object/spigot. - * @return Returns 0 upon success and < 0 upon failure. + * @param tm_queue Specifies the tm_queue. + * @param dst_tm_node odp_tm_node_t handle of the tm_node object that will + * receive all of the pkt_descs from the src tm_node + * output. If ODP_TM_ROOT, then attachment is to + * the root egress object/spigot. + * @return Returns 0 upon success and < 0 upon failure. */ int odp_tm_queue_connect(odp_tm_queue_t tm_queue, odp_tm_node_t dst_tm_node); @@ -1577,8 +1574,8 @@ int odp_tm_queue_connect(odp_tm_queue_t tm_queue, odp_tm_node_t dst_tm_node); * tm_queue from its fanout. Note that it is legal for this tm_queue to * have no fanout connection. * - * @param[in] tm_queue Specifies the tm_queue. - * @return 0 upon success, < 0 on failure. + * @param tm_queue Specifies the tm_queue. + * @return 0 upon success, < 0 on failure. */ int odp_tm_queue_disconnect(odp_tm_queue_t tm_queue); @@ -1597,10 +1594,10 @@ int odp_tm_queue_disconnect(odp_tm_queue_t tm_queue); * shaper_color produced from the TM shaper entities within the tm_inputs and * tm_nodes. * - * @param[in] tm_queue Specifies the tm_queue (and indirectly the TM system). - * @param[in] pkt Handle to a packet. - * @return Returns 0 upon success, < 0 upon failure. One of the - * more common failure reasons is WRED drop. + * @param tm_queue Specifies the tm_queue (and indirectly the TM system). + * @param pkt Handle to a packet. + * @return Returns 0 upon success, < 0 upon failure. One of the + * more common failure reasons is WRED drop. */ int odp_tm_enq(odp_tm_queue_t tm_queue, odp_packet_t pkt); @@ -1608,10 +1605,10 @@ int odp_tm_enq(odp_tm_queue_t tm_queue, odp_packet_t pkt); * except that it also returns (an approximation to?) the current tm_queue * packet queue count. * - * @param[in] tm_queue Specifies the tm_queue (and indirectly the TM system). - * @param[in] pkt Handle to a packet. - * @return Returns the number of packets previously enqueued on - * this tm_queue upon success, < 0 upon failure. + * @param tm_queue Specifies the tm_queue (and indirectly the TM system). + * @param pkt Handle to a packet. + * @return Returns the number of packets previously enqueued on + * this tm_queue upon success, < 0 upon failure. */ int odp_tm_enq_with_cnt(odp_tm_queue_t tm_queue, odp_packet_t pkt); @@ -1656,7 +1653,7 @@ typedef struct { * The odp_tm_node_info() function is used to extract various bits of * configuration associated with a given tm_node. * - * @param[in] tm_node Specifies the tm_node to be queried. + * @param tm_node Specifies the tm_node to be queried. * @param[out] info A pointer to an odp_tm_node_info_t record that is to * be filled in by this call. * @return Returns < 0 upon failure, 0 upon success. @@ -1716,11 +1713,11 @@ typedef struct { * Note that all new additions to a fanin list always take place at the end of * the list. * - * @param[in] tm_node Specifies the tm_node to be queried. - * @param[inout] info A pointer to an odp_tm_node_fanin_info_t record that - * is used to determine which fanin entry is to be - * next filled in by this call. - * @return Returns < 0 upon failure, 0 upon success. + * @param tm_node Specifies the tm_node to be queried. + * @param[in,out] info A pointer to an odp_tm_node_fanin_info_t record that + * is used to determine which fanin entry is to be + * next filled in by this call. + * @return Returns < 0 upon failure, 0 upon success. */ int odp_tm_node_fanin_info(odp_tm_node_t tm_node, odp_tm_node_fanin_info_t *info); @@ -1761,7 +1758,7 @@ typedef struct { * The odp_tm_queue_info() function is used to extract various bits of * configuration associated with a given tm_queue. * - * @param[in] tm_queue Specifies the tm_queue to be queried. + * @param tm_queue Specifies the tm_queue to be queried. * @param[out] info A pointer to an odp_tm_queue_info_t record that is to * be filled in by this call. * @return Returns < 0 upon failure, 0 upon success. @@ -1845,7 +1842,7 @@ typedef struct { * regardless of query_flags if the cost of returning all the counts is * comparable to the cost of checking the query_flags. * - * @param[in] tm_queue Specifies the tm_queue (and indirectly the + * @param tm_queue Specifies the tm_queue (and indirectly the * TM system). * @param[out] query_flags A set of flag bits indicating which counters are * being requested to be returned in the info record. @@ -1865,8 +1862,8 @@ int odp_tm_queue_query(odp_tm_queue_t tm_queue, * returning all the counts is comparable to the cost of checking the * query_flags. * - * @param[in] odp_tm Specifies the TM system. - * @param[in] priority Supplies the strict priority level used to specify + * @param odp_tm Specifies the TM system. + * @param priority Supplies the strict priority level used to specify * which tm_queues are included in the info values. * @param[out] query_flags A set of flag bits indicating which counters are * being requested to be returned in the info record. @@ -1887,7 +1884,7 @@ int odp_tm_priority_query(odp_tm_t odp_tm, * returning all the counts is comparable to the cost of checking the * query_flags. * - * @param[in] odp_tm Specifies the TM system. + * @param odp_tm Specifies the TM system. * @param[out] query_flags A set of flag bits indicating which counters are * being requested to be returned in the info record. * @param[out] info Pointer to an odp_tm_query_info_t record where the @@ -1904,14 +1901,14 @@ int odp_tm_total_query(odp_tm_t odp_tm, * semantic effects other than returning these queue threshold values in the * odp_tm_query_info_t record. * - * @param[in] odp_tm Specifies the TM system. - * @param[in] priority Supplies the strict priority level that - * the threshold profile params are associated - * with. - * @param[in] thresholds_profile Specifies the queue threshold profile that - * should now be associated with the supplied - * strict priority level. - * @return Returns 0 upon success and < 0 upon failure. + * @param odp_tm Specifies the TM system. + * @param priority Supplies the strict priority level that + * the threshold profile params are associated with. + * + * @param thresholds_profile Specifies the queue threshold profile that + * should now be associated with the supplied + * strict priority level. + * @return Returns 0 upon success and < 0 upon failure. */ int odp_tm_priority_threshold_config(odp_tm_t odp_tm, uint8_t priority, @@ -1923,11 +1920,11 @@ int odp_tm_priority_threshold_config(odp_tm_t odp_tm, * other than returning these queue threshold values in the * odp_tm_query_info_t record. * - * @param[in] odp_tm Specifies the TM system. - * @param[in] thresholds_profile Specifies the queue threshold profile that - * should now be used for the entire TM - * system. - * @return Returns 0 upon success and < 0 upon failure. + * @param odp_tm Specifies the TM system. + * @param thresholds_profile Specifies the queue threshold profile that + * should now be used for the entire TM + * system. + * @return Returns 0 upon success and < 0 upon failure. */ int odp_tm_total_threshold_config(odp_tm_t odp_tm, odp_tm_threshold_t thresholds_profile); @@ -1941,8 +1938,8 @@ int odp_tm_total_threshold_config(odp_tm_t odp_tm, * since for some implementations this call could take a fairly long time * to execute! * - * @param[in] odp_tm Specifies the TM system. - * @return Returns 1 if the TM system is idle and 0 otherwise. + * @param odp_tm Specifies the TM system. + * @return Returns 1 if the TM system is idle and 0 otherwise. */ odp_bool_t odp_tm_is_idle(odp_tm_t odp_tm); @@ -1950,7 +1947,7 @@ odp_bool_t odp_tm_is_idle(odp_tm_t odp_tm); * information about the specified TM system to the ODP log. The intended use * is for debugging. * - * @param[in] odp_tm Specifies the TM system. + * @param odp_tm Specifies the TM system. */ void odp_tm_stats_print(odp_tm_t odp_tm); commit 297df8bbdd88a2104c6dd0f6c2e506eb5140dd1c Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon Dec 4 14:18:17 2017 +0200 api: cls: remove param-in doxygen tag All parameters are input only (tag [in]) by default. Output parameters are better highlighted, when only those are tagged. Also changed tab to spaces inside documentation. Text is more readable on various editors when tabs and spaces are not mixed. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/classification.h b/include/odp/api/spec/classification.h index 16bf3e6e..4db046fc 100644 --- a/include/odp/api/spec/classification.h +++ b/include/odp/api/spec/classification.h @@ -287,7 +287,7 @@ typedef struct odp_cls_cos_param { * * Initialize an odp_cls_cos_param_t to its default value for all fields * - * @param param Address of the odp_cls_cos_param_t to be initialized + * @param param Address of the odp_cls_cos_param_t to be initialized */ void odp_cls_cos_param_init(odp_cls_cos_param_t *param); @@ -296,10 +296,10 @@ void odp_cls_cos_param_init(odp_cls_cos_param_t *param); * * Outputs classification capabilities on success. * - * @param[out] capability Pointer to classification capability structure. + * @param[out] capability Pointer to classification capability structure. * - * @retval 0 on success - * @retval <0 on failure + * @retval 0 on success + * @retval <0 on failure */ int odp_cls_capability(odp_cls_capability_t *capability); @@ -308,12 +308,12 @@ int odp_cls_capability(odp_cls_capability_t *capability); * * The use of class-of-service name is optional. Unique names are not required. * - * @param name Name of the class-of-service or NULL. Maximum string - * length is ODP_COS_NAME_LEN. - * @param param Class-of-service parameters + * @param name Name of the class-of-service or NULL. Maximum string + * length is ODP_COS_NAME_LEN. + * @param param Class-of-service parameters * - * @retval Class-of-service handle - * @retval ODP_COS_INVALID on failure. + * @retval Class-of-service handle + * @retval ODP_COS_INVALID on failure. * * @note ODP_QUEUE_INVALID and ODP_POOL_INVALID are valid values for queue * and pool associated with a class of service and when any one of these values @@ -327,12 +327,11 @@ odp_cos_t odp_cls_cos_create(const char *name, odp_cls_cos_param_t *param); * based on the packet parameters and hash protocol field configured with the * class of service. * - * @param cos class of service - * @param packet Packet handle + * @param cos class of service + * @param packet Packet handle * - * @retval Returns the queue handle on which this packet will be - * enqueued. - * @retval ODP_QUEUE_INVALID for error case + * @retval Returns the queue handle on which this packet will be enqueued. + * @retval ODP_QUEUE_INVALID for error case * * @note The packet has to be updated with valid header pointers L2, L3 and L4. */ @@ -341,60 +340,54 @@ odp_queue_t odp_cls_hash_result(odp_cos_t cos, odp_packet_t packet); /** * Discard a class-of-service along with all its associated resources * - * @param[in] cos_id class-of-service instance. + * @param cos_id class-of-service instance. * - * @retval 0 on success - * @retval <0 on failure + * @retval 0 on success + * @retval <0 on failure */ int odp_cos_destroy(odp_cos_t cos_id); /** * Assign a queue for a class-of-service * - * @param[in] cos_id class-of-service instance. + * @param cos_id class-of-service instance. + * @param queue_id Identifier of a queue where all packets of this specific + * class of service will be enqueued. * - * @param[in] queue_id Identifier of a queue where all packets - * of this specific class of service - * will be enqueued. - * - * @retval 0 on success - * @retval <0 on failure + * @retval 0 on success + * @retval <0 on failure */ int odp_cos_queue_set(odp_cos_t cos_id, odp_queue_t queue_id); /** * Get the queue associated with the specific class-of-service * -* @param[in] cos_id class-of-service instance. -* -* @retval queue_handle Queue handle associated with the -* given class-of-service +* @param cos_id class-of-service instance. * -* @retval ODP_QUEUE_INVALID on failure +* @retval Queue handle associated with the given class-of-service +* @retval ODP_QUEUE_INVALID on failure */ odp_queue_t odp_cos_queue(odp_cos_t cos_id); /** * Get the number of queues linked with the specific class-of-service * - * @param cos_id class-of-service instance. + * @param cos_id class-of-service instance. * - * @return Number of queues linked with the class-of-service. + * @return Number of queues linked with the class-of-service. */ uint32_t odp_cls_cos_num_queue(odp_cos_t cos_id); /** * Get the list of queue associated with the specific class-of-service * - * @param[in] cos_id class-of-service instance. - * - * @param[out] queue Array of queue handles associated - * with the class-of-service. - * - * @param[in] num Maximum number of queue handles to output. + * @param cos_id class-of-service instance. + * @param[out] queue Array of queue handles associated with + * the class-of-service. + * @param num Maximum number of queue handles to output. * - * @return Number of queues linked with CoS - * @retval 0 on failure + * @return Number of queues linked with CoS + * @retval on 0 failure */ uint32_t odp_cls_cos_queues(odp_cos_t cos_id, odp_queue_t queue[], uint32_t num); @@ -402,11 +395,11 @@ uint32_t odp_cls_cos_queues(odp_cos_t cos_id, odp_queue_t queue[], /** * Assign packet drop policy for specific class-of-service * - * @param[in] cos_id class-of-service instance. - * @param[in] drop_policy Desired packet drop policy for this class. + * @param cos_id class-of-service instance. + * @param drop_policy Desired packet drop policy for this class. * - * @retval 0 on success - * @retval <0 on failure + * @retval 0 on success + * @retval <0 on failure * * @note Optional. */ @@ -415,10 +408,9 @@ int odp_cos_drop_set(odp_cos_t cos_id, odp_cls_drop_t drop_policy); /** * Get the drop policy configured for a specific class-of-service instance. * -* @param[in] cos_id class-of-service instance. +* @param cos_id class-of-service instance. * -* @retval Drop policy configured with the given -* class-of-service +* @retval Drop policy configured with the given class-of-service */ odp_cls_drop_t odp_cos_drop(odp_cos_t cos_id); @@ -426,13 +418,14 @@ odp_cls_drop_t odp_cos_drop(odp_cos_t cos_id); * Request to override per-port class of service * based on Layer-2 priority field if present. * - * @param[in] pktio_in Ingress port identifier. - * @param[in] num_qos Number of QoS levels, typically 8. - * @param[in] qos_table Values of the Layer-2 QoS header field. - * @param[in] cos_table Class-of-service assigned to each of the - * allowed Layer-2 QOS levels. - * @retval 0 on success - * @retval <0 on failure + * @param pktio_in Ingress port identifier. + * @param num_qos Number of QoS levels, typically 8. + * @param qos_table Values of the Layer-2 QoS header field. + * @param cos_table Class-of-service assigned to each of the allowed + * Layer-2 QOS levels. + * + * @retval 0 on success + * @retval <0 on failure */ int odp_cos_with_l2_priority(odp_pktio_t pktio_in, uint8_t num_qos, @@ -443,16 +436,15 @@ int odp_cos_with_l2_priority(odp_pktio_t pktio_in, * Request to override per-port class of service * based on Layer-3 priority field if present. * - * @param[in] pktio_in Ingress port identifier. - * @param[in] num_qos Number of allowed Layer-3 QoS levels. - * @param[in] qos_table Values of the Layer-3 QoS header field. - * @param[in] cos_table Class-of-service assigned to each of the - * allowed Layer-3 QOS levels. - * @param[in] l3_preference when true, Layer-3 QoS overrides - * L2 QoS when present. + * @param pktio_in Ingress port identifier. + * @param num_qos Number of allowed Layer-3 QoS levels. + * @param qos_table Values of the Layer-3 QoS header field. + * @param cos_table Class-of-service assigned to each of the allowed + * Layer-3 QOS levels. + * @param l3_preference when true, Layer-3 QoS overrides L2 QoS when present. * - * @retval 0 on success - * @retval <0 on failure + * @retval 0 on success + * @retval <0 on failure * * @note Optional. */ @@ -462,7 +454,6 @@ int odp_cos_with_l3_qos(odp_pktio_t pktio_in, odp_cos_t cos_table[], odp_bool_t l3_preference); - /** * @typedef odp_cos_flow_set_t * Set of header fields that take part in flow signature hash calculation: @@ -554,7 +545,7 @@ typedef struct odp_pmr_param_t { * * Initialize an odp_pmr_param_t to its default values for all fields * - * @param param Address of the odp_pmr_param_t to be initialized + * @param param Address of the odp_pmr_param_t to be initialized */ void odp_cls_pmr_param_init(odp_pmr_param_t *param); @@ -571,14 +562,14 @@ void odp_cls_pmr_param_init(odp_pmr_param_t *param); * of inspecting the return value when installing such rules, and perform * appropriate fallback action. * - * @param[in] terms Array of odp_pmr_param_t entries, one entry per - * term desired. - * @param[in] num_terms Number of terms in the match rule. - * @param[in] src_cos source CoS handle - * @param[in] dst_cos destination CoS handle + * @param terms Array of odp_pmr_param_t entries, one entry per term + * desired. + * @param num_terms Number of terms in the match rule. + * @param src_cos source CoS handle + * @param dst_cos destination CoS handle * - * @return Handle to the Packet Match Rule. - * @retval ODP_PMR_INVAL on failure + * @return Handle to the Packet Match Rule. + * @retval ODP_PMR_INVAL on failure */ odp_pmr_t odp_cls_pmr_create(const odp_pmr_param_t *terms, int num_terms, odp_cos_t src_cos, odp_cos_t dst_cos); @@ -593,10 +584,10 @@ odp_pmr_t odp_cls_pmr_create(const odp_pmr_param_t *terms, int num_terms, * may not guarantee the availability of hardware resources to create the * same or essentially similar rule. * - * @param[in] pmr_id Identifier of the PMR to be destroyed + * @param pmr_id Identifier of the PMR to be destroyed * - * @retval 0 on success - * @retval <0 on failure + * @retval 0 on success + * @retval <0 on failure */ int odp_cls_pmr_destroy(odp_pmr_t pmr_id); @@ -607,31 +598,30 @@ int odp_cls_pmr_destroy(odp_pmr_t pmr_id); * The packet pool associated with class of service will supersede the * packet pool associated with the pktio interface. * -* @param cos_id class of service handle -* @param pool_id packet pool handle +* @param cos_id class of service handle +* @param pool_id packet pool handle * -* @retval 0 on success -* @retval <0 on failure +* @retval 0 on success +* @retval <0 on failure */ int odp_cls_cos_pool_set(odp_cos_t cos_id, odp_pool_t pool_id); /** * Get the pool associated with the given class of service * -* @param cos_id class of service handle +* @param cos_id class of service handle * -* @retval pool handle of the associated pool -* @retval ODP_POOL_INVALID if no associated pool found or -* in case of an error +* @retval pool handle of the associated pool +* @retval ODP_POOL_INVALID if no associated pool found or in case of an error */ odp_pool_t odp_cls_cos_pool(odp_cos_t cos_id); /** * Get printable value for an odp_cos_t * - * @param hdl odp_cos_t handle to be printed - * @return uint64_t value that can be used to print/display this - * handle + * @param hdl odp_cos_t handle to be printed + * + * @return uint64_t value that can be used to print/display this handle * * @note This routine is intended to be used for diagnostic purposes * to enable applications to generate a printable value that represents @@ -642,9 +632,9 @@ uint64_t odp_cos_to_u64(odp_cos_t hdl); /** * Get printable value for an odp_pmr_t * - * @param hdl odp_pmr_t handle to be printed - * @return uint64_t value that can be used to print/display this - * handle + * @param hdl odp_pmr_t handle to be printed + * + * @return uint64_t value that can be used to print/display this handle * * @note This routine is intended to be used for diagnostic purposes * to enable applications to generate a printable value that represents commit 32bd7464a8d86b0d83daf1760202dbdc5eabccec Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon Dec 4 13:51:50 2017 +0200 api: queue: remove param-in doxygen tag All parameters are input only (tag [in]) by default. Output parameters are better highlighted, when only those are tagged. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/queue.h b/include/odp/api/spec/queue.h index 73598be0..014d3362 100644 --- a/include/odp/api/spec/queue.h +++ b/include/odp/api/spec/queue.h @@ -309,7 +309,7 @@ int odp_queue_enq(odp_queue_t queue, odp_event_t ev); * has to take care of them. * * @param queue Queue handle - * @param[in] events Array of event handles + * @param events Array of event handles * @param num Number of event handles to enqueue * * @return Number of events actually enqueued (0 ... num) ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/classification.h | 166 +++++---- include/odp/api/spec/queue.h | 2 +- include/odp/api/spec/traffic_mngr.h | 639 +++++++++++++++++----------------- 3 files changed, 397 insertions(+), 410 deletions(-) hooks/post-receive --

8 years, 2 months

[COMMIT] branch master updated. v1.16.0.0-13-g811281a2

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 811281a22b6274b7f41b926a9cfbe09e48a366bd (commit) from 5329e5211c447b9b823149baf76112eedfeb07fb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 811281a22b6274b7f41b926a9cfbe09e48a366bd Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Nov 28 14:54:54 2017 +0200 travis: add enable-deprecated test configuration Test ODP build with 'enable-deprecated' flag set. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index b5c1b641..976f0763 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,6 +69,7 @@ cache: env: - CONF="" - CONF="--disable-abi-compat" + - CONF="--enable-deprecated" - CONF="--enable-schedule-sp" - CONF="--enable-schedule-iquery" - CONF="--enable-dpdk-zero-copy" ----------------------------------------------------------------------- Summary of changes: .travis.yml | 1 + 1 file changed, 1 insertion(+) hooks/post-receive --

8 years, 2 months

[COMMIT] branch api-next updated. v1.16.0.0-642-gcf7d38c1

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via cf7d38c194f1a9183a524790511de8bfd74a36a9 (commit) via c3f33dfa9ad624a7450b3f03bd06af7f92b69d8b (commit) via 94530b3d56086e446fe056098fa37da048efd1b6 (commit) via a65377ad173426db06b023764703f158e88565e2 (commit) via ea8e4fff42411c5534ba7fbeeefd8fec4c1ac8be (commit) via 52b07a3ffadeb7f653b1a3a1a129402e3becd027 (commit) via 1e41d8bb45ccc1d7f5b7340742d8c9f85eb9660c (commit) via 7c027d493295ba07fd27697827300e4c8e15475d (commit) from bdb7cbf620ada8682c89b5ae5a97cb84f16c0ed0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit cf7d38c194f1a9183a524790511de8bfd74a36a9 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Oct 17 15:22:52 2017 +0300 api: pool: remove union from params Remove anonymous union from pool parameter structure. Union makes it impossible to initialize parameters per pool type (use other values than all zeros). This change is not visible to applications (union was anonymous). Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/pool.h b/include/odp/api/spec/pool.h index 11feb1bc..05f019f3 100644 --- a/include/odp/api/spec/pool.h +++ b/include/odp/api/spec/pool.h @@ -195,113 +195,110 @@ typedef struct odp_pool_param_t { /** Pool type */ int type; - /** Variant parameters for different pool types */ - union { - /** Parameters for buffer pools */ - struct { - /** Number of buffers in the pool */ - uint32_t num; - - /** Buffer size in bytes. The maximum number of bytes - application will store in each buffer. */ - uint32_t size; - - /** Minimum buffer alignment in bytes. Valid values are - powers of two. Use 0 for default alignment. - Default will always be a multiple of 8. */ - uint32_t align; - } buf; - - /** Parameters for packet pools */ - struct { - /** Minimum number of 'len' byte packets. - * - * The pool must contain at least this many packets - * that are 'len' bytes or smaller. An implementation - * may round up the value, as long as the 'max_num' - * parameter below is not violated. The maximum value - * for this field is defined by pool capability - * pkt.max_num. - */ - uint32_t num; - - /** Maximum number of packets. - * - * This is the maximum number of packets of any length - * that can be allocated from the pool. The maximum - * value is defined by pool capability pkt.max_num. - * Use 0 when there's no requirement for the maximum - * number of packets. The default value is 0. - */ - uint32_t max_num; - - /** Minimum length of 'num' packets. - * - * The pool must contain at least 'num' packets up to - * this packet length (1 ... 'len' bytes). The maximum - * value for this field is defined by pool capability - * pkt.max_len. Use 0 for default. - */ - uint32_t len; - - /** Maximum packet length that will be allocated from - the pool. The maximum value is defined by pool - capability pkt.max_len. Use 0 for default (the - pool maximum). */ - uint32_t max_len; - - /** Minimum number of packet data bytes that are stored - in the first segment of a packet. The maximum value - is defined by pool capability pkt.max_seg_len. - Use 0 for default. */ - uint32_t seg_len; - - /** User area size in bytes. The maximum value is - defined by pool capability pkt.max_uarea_size. - Specify as 0 if no user area is needed. */ - uint32_t uarea_size; - - /** Minimum Headroom size in bytes. Each newly allocated - packet from the pool must have at least this much - headroom. The maximum value is defined by pool - capability pkt.max_headroom. - Use zero if headroom is not needed. */ - uint32_t headroom; - - /** Number of subparameters - * - * The number of subparameter table entries used. - * The maximum value is defined by pool - * capability pkt.max_num_subparam. The default value - * is 0. - */ - uint8_t num_subparam; - - /** Subparameter table - * - * Subparameters continue pool configuration with - * additional packet length requirements. The first - * table entry follows the num/len specification above. - * So that, sub[0].len > 'len', and sub[0].num refers - * to packet lengths between 'len' + 1 and sub[0].len. - * Similarly, sub[1] follows sub[0] specification, and - * so on. - * - * Each requirement is supported separately and may be - * rounded up, as long as the 'max_num' parameter is - * not violated. It's implementation specific if some - * requirements are supported simultaneously (e.g. - * due to subpool design). - */ - odp_pool_pkt_subparam_t sub[ODP_POOL_MAX_SUBPARAMS]; - } pkt; - - /** Parameters for timeout pools */ - struct { - /** Number of timeouts in the pool */ - uint32_t num; - } tmo; - }; + /** Parameters for buffer pools */ + struct { + /** Number of buffers in the pool */ + uint32_t num; + + /** Buffer size in bytes. The maximum number of bytes + * application will store in each buffer. + */ + uint32_t size; + + /** Minimum buffer alignment in bytes. Valid values are + * powers of two. Use 0 for default alignment. + * Default will always be a multiple of 8. + */ + uint32_t align; + } buf; + + /** Parameters for packet pools */ + struct { + /** Minimum number of 'len' byte packets. + * + * The pool must contain at least this many packets that are + * 'len' bytes or smaller. An implementation may round up the + * value, as long as the 'max_num' parameter below is not + * violated. The maximum value for this field is defined by + * pool capability pkt.max_num. + */ + uint32_t num; + + /** Maximum number of packets. + * + * This is the maximum number of packets of any length that can + * be allocated from the pool. The maximum value is defined by + * pool capability pkt.max_num. Use 0 when there's no + * requirement for the maximum number of packets. The default + * value is 0. + */ + uint32_t max_num; + + /** Minimum length of 'num' packets. + * + * The pool must contain at least 'num' packets up to this + * packet length (1 ... 'len' bytes). The maximum value for + * this field is defined by pool capability pkt.max_len. + * Use 0 for default. + */ + uint32_t len; + + /** Maximum packet length that will be allocated from + * the pool. The maximum value is defined by pool capability + * pkt.max_len. Use 0 for default (the pool maximum). + */ + uint32_t max_len; + + /** Minimum number of packet data bytes that are stored in the + * first segment of a packet. The maximum value is defined by + * pool capability pkt.max_seg_len. Use 0 for default. + */ + uint32_t seg_len; + + /** User area size in bytes. The maximum value is defined by + * pool capability pkt.max_uarea_size. Specify as 0 if no user + * area is needed. + */ + uint32_t uarea_size; + + /** Minimum headroom size in bytes. Each newly allocated + * packet from the pool must have at least this much headroom. + * The maximum value is defined by pool capability + * pkt.max_headroom. Use zero if headroom is not needed. + */ + uint32_t headroom; + + /** Number of subparameters + * + * The number of subparameter table entries used. The maximum + * value is defined by pool capability pkt.max_num_subparam. + * The default value is 0. + */ + uint8_t num_subparam; + + /** Subparameter table + * + * Subparameters continue pool configuration with additional + * packet length requirements. The first table entry follows + * the num/len specification above. So that, sub[0].len > 'len' + * and sub[0].num refers to packet lengths between 'len' + 1 + * and sub[0].len. Similarly, sub[1] follows sub[0] + * specification, and so on. + * + * Each requirement is supported separately and may be rounded + * up, as long as the 'max_num' parameter is not violated. It's + * implementation specific if some requirements are supported + * simultaneously (e.g. due to subpool design). + */ + odp_pool_pkt_subparam_t sub[ODP_POOL_MAX_SUBPARAMS]; + } pkt; + + /** Parameters for timeout pools */ + struct { + /** Number of timeouts in the pool */ + uint32_t num; + } tmo; + } odp_pool_param_t; /** Packet pool*/ commit c3f33dfa9ad624a7450b3f03bd06af7f92b69d8b Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon Oct 16 15:20:07 2017 +0300 validation: pool: add packet info test Added odp_pool_info() test for packet pools. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/pool/pool.c b/test/validation/api/pool/pool.c index 461715cc..84c17720 100644 --- a/test/validation/api/pool/pool.c +++ b/test/validation/api/pool/pool.c @@ -191,12 +191,40 @@ void pool_test_alloc_packet_subparam(void) CU_ASSERT(odp_pool_destroy(pool) == 0); } +void pool_test_info_packet(void) +{ + odp_pool_t pool; + odp_pool_info_t info; + odp_pool_param_t param; + const char pool_name[] = "test_pool_name"; + + odp_pool_param_init(&param); + + param.type = ODP_POOL_PACKET; + param.pkt.num = PKT_NUM; + param.pkt.len = PKT_LEN; + + pool = odp_pool_create(pool_name, &param); + CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); + + CU_ASSERT_FATAL(odp_pool_info(pool, &info) == 0); + + CU_ASSERT(strncmp(pool_name, info.name, sizeof(pool_name)) == 0); + CU_ASSERT(info.params.type == ODP_POOL_PACKET); + CU_ASSERT(info.params.pkt.num == param.pkt.num); + CU_ASSERT(info.params.pkt.len == param.pkt.len); + CU_ASSERT(info.pkt.max_num >= param.pkt.num); + + CU_ASSERT(odp_pool_destroy(pool) == 0); +} + odp_testinfo_t pool_suite[] = { ODP_TEST_INFO(pool_test_create_destroy_buffer), ODP_TEST_INFO(pool_test_create_destroy_packet), ODP_TEST_INFO(pool_test_create_destroy_timeout), ODP_TEST_INFO(pool_test_alloc_packet), ODP_TEST_INFO(pool_test_alloc_packet_subparam), + ODP_TEST_INFO(pool_test_info_packet), ODP_TEST_INFO(pool_test_lookup_info_print), ODP_TEST_INFO_NULL, }; diff --git a/test/validation/api/pool/pool.h b/test/validation/api/pool/pool.h index 3f8f5ebc..b284524e 100644 --- a/test/validation/api/pool/pool.h +++ b/test/validation/api/pool/pool.h @@ -16,6 +16,7 @@ void pool_test_create_destroy_timeout(void); void pool_test_lookup_info_print(void); void pool_test_alloc_packet(void); void pool_test_alloc_packet_subparam(void); +void pool_test_info_packet(void); /* test arrays: */ extern odp_testinfo_t pool_suite[]; commit 94530b3d56086e446fe056098fa37da048efd1b6 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon Oct 16 15:25:01 2017 +0300 linux-gen: pool: implement max_num info Implemented max_num info for packet pools. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 7584aec0..25f0ed3b 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -705,6 +705,9 @@ int odp_pool_info(odp_pool_t pool_hdl, odp_pool_info_t *info) info->name = pool->name; info->params = pool->params; + if (pool->params.type == ODP_POOL_PACKET) + info->pkt.max_num = pool->num; + return 0; } commit a65377ad173426db06b023764703f158e88565e2 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon Oct 16 14:57:15 2017 +0300 api: pool: add max packet num info Packet pool parameters does not require application to specify the maximum number of packet. Application is more portable, if it does not restrict max_num, but instead uses this info field after pool creation. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/pool.h b/include/odp/api/spec/pool.h index 2900fc46..11feb1bc 100644 --- a/include/odp/api/spec/pool.h +++ b/include/odp/api/spec/pool.h @@ -358,24 +358,42 @@ odp_pool_t odp_pool_lookup(const char *name); * Used to get information about a pool. */ typedef struct odp_pool_info_t { - const char *name; /**< pool name */ - odp_pool_param_t params; /**< pool parameters */ + /** Pool name */ + const char *name; + + /** Copy of pool parameters */ + odp_pool_param_t params; + + /** Additional info for packet pools */ + struct { + /** Maximum number of packets of any length + * + * This is the maximum number of packets that can be allocated + * from the pool at anytime. Application can use this e.g. + * to prepare enough per packet contexts. + */ + uint32_t max_num; + + } pkt; /** Minimum data address. - * This is the minimum address that application accessible - * data of any object (event) allocated from the pool may - * locate. When there's no application accessible data - * (e.g. ODP_POOL_TIMEOUT pools), the value may be zero. + * + * This is the minimum address that application accessible + * data of any object (event) allocated from the pool may + * locate. When there's no application accessible data + * (e.g. ODP_POOL_TIMEOUT pools), the value may be zero. */ uintptr_t min_data_addr; /** Maximum data address. - * This is the maximum address that application accessible - * data of any object (event) allocated from the pool may - * locate. When there's no application accessible data - * (e.g. ODP_POOL_TIMEOUT pools), the value may be zero. + * + * This is the maximum address that application accessible + * data of any object (event) allocated from the pool may + * locate. When there's no application accessible data + * (e.g. ODP_POOL_TIMEOUT pools), the value may be zero. */ uintptr_t max_data_addr; + } odp_pool_info_t; /** @@ -389,7 +407,6 @@ typedef struct odp_pool_info_t { * @retval 0 Success * @retval -1 Failure. Info could not be retrieved. */ - int odp_pool_info(odp_pool_t pool, odp_pool_info_t *info); /** commit ea8e4fff42411c5534ba7fbeeefd8fec4c1ac8be Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon Oct 16 14:06:51 2017 +0300 validation: pool: initialize params correctly Use odp_pool_param_init() to initialize pool parameters. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/pool/pool.c b/test/validation/api/pool/pool.c index c38a336c..461715cc 100644 --- a/test/validation/api/pool/pool.c +++ b/test/validation/api/pool/pool.c @@ -16,11 +16,11 @@ static const int default_buffer_size = 1500; static const int default_buffer_num = 1000; -static void pool_create_destroy(odp_pool_param_t *params) +static void pool_create_destroy(odp_pool_param_t *param) { odp_pool_t pool; - pool = odp_pool_create(NULL, params); + pool = odp_pool_create(NULL, param); CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); CU_ASSERT(odp_pool_to_u64(pool) != odp_pool_to_u64(ODP_POOL_INVALID)); @@ -29,42 +29,41 @@ static void pool_create_destroy(odp_pool_param_t *params) void pool_test_create_destroy_buffer(void) { - odp_pool_param_t params = { - .buf = { - .size = default_buffer_size, - .align = ODP_CACHE_LINE_SIZE, - .num = default_buffer_num, - }, - .type = ODP_POOL_BUFFER, - }; - - pool_create_destroy(&params); + odp_pool_param_t param; + + odp_pool_param_init(&param); + + param.type = ODP_POOL_BUFFER, + param.buf.size = default_buffer_size; + param.buf.align = ODP_CACHE_LINE_SIZE; + param.buf.num = default_buffer_num; + + pool_create_destroy(&param); } void pool_test_create_destroy_packet(void) { - odp_pool_param_t params = { - .pkt = { - .seg_len = 0, - .len = default_buffer_size, - .num = default_buffer_num, - }, - .type = ODP_POOL_PACKET, - }; - - pool_create_destroy(&params); + odp_pool_param_t param; + + odp_pool_param_init(&param); + + param.type = ODP_POOL_PACKET; + param.pkt.len = default_buffer_size; + param.pkt.num = default_buffer_num; + + pool_create_destroy(&param); } void pool_test_create_destroy_timeout(void) { - odp_pool_param_t params = { - .tmo = { - .num = default_buffer_num, - }, - .type = ODP_POOL_TIMEOUT, - }; - - pool_create_destroy(&params); + odp_pool_param_t param; + + odp_pool_param_init(&param); + + param.type = ODP_POOL_TIMEOUT; + param.tmo.num = default_buffer_num; + + pool_create_destroy(&param); } void pool_test_lookup_info_print(void) @@ -72,16 +71,16 @@ void pool_test_lookup_info_print(void) odp_pool_t pool; const char pool_name[] = "pool_for_lookup_test"; odp_pool_info_t info; - odp_pool_param_t params = { - .buf = { - .size = default_buffer_size, - .align = ODP_CACHE_LINE_SIZE, - .num = default_buffer_num, - }, - .type = ODP_POOL_BUFFER, - }; - - pool = odp_pool_create(pool_name, &params); + odp_pool_param_t param; + + odp_pool_param_init(&param); + + param.type = ODP_POOL_BUFFER; + param.buf.size = default_buffer_size; + param.buf.align = ODP_CACHE_LINE_SIZE; + param.buf.num = default_buffer_num; + + pool = odp_pool_create(pool_name, &param); CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); pool = odp_pool_lookup(pool_name); @@ -89,10 +88,10 @@ void pool_test_lookup_info_print(void) CU_ASSERT_FATAL(odp_pool_info(pool, &info) == 0); CU_ASSERT(strncmp(pool_name, info.name, sizeof(pool_name)) == 0); - CU_ASSERT(params.buf.size <= info.params.buf.size); - CU_ASSERT(params.buf.align <= info.params.buf.align); - CU_ASSERT(params.buf.num <= info.params.buf.num); - CU_ASSERT(params.type == info.params.type); + CU_ASSERT(param.buf.size <= info.params.buf.size); + CU_ASSERT(param.buf.align <= info.params.buf.align); + CU_ASSERT(param.buf.num <= info.params.buf.num); + CU_ASSERT(param.type == info.params.type); odp_pool_print(pool); commit 52b07a3ffadeb7f653b1a3a1a129402e3becd027 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon Oct 16 13:55:14 2017 +0300 validation: pool: add subparam test Test packet pool subparameters when those are supported. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/pool/pool.c b/test/validation/api/pool/pool.c index e633137a..c38a336c 100644 --- a/test/validation/api/pool/pool.c +++ b/test/validation/api/pool/pool.c @@ -10,6 +10,9 @@ #include "odp_cunit_common.h" #include "pool.h" +#define PKT_LEN 400 +#define PKT_NUM 500 + static const int default_buffer_size = 1500; static const int default_buffer_num = 1000; @@ -96,10 +99,105 @@ void pool_test_lookup_info_print(void) CU_ASSERT(odp_pool_destroy(pool) == 0); } +void pool_test_alloc_packet(void) +{ + odp_pool_t pool; + odp_pool_param_t param; + uint32_t i, num; + odp_packet_t pkt[PKT_NUM]; + + odp_pool_param_init(&param); + + param.type = ODP_POOL_PACKET, + param.pkt.num = PKT_NUM; + param.pkt.len = PKT_LEN; + + pool = odp_pool_create(NULL, &param); + + CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); + + num = 0; + + for (i = 0; i < PKT_NUM; i++) { + pkt[num] = odp_packet_alloc(pool, PKT_LEN); + CU_ASSERT(pkt[num] != ODP_PACKET_INVALID); + + if (pkt[num] != ODP_PACKET_INVALID) + num++; + } + + for (i = 0; i < num; i++) + odp_packet_free(pkt[i]); + + CU_ASSERT(odp_pool_destroy(pool) == 0); +} + +void pool_test_alloc_packet_subparam(void) +{ + odp_pool_t pool; + odp_pool_capability_t capa; + odp_pool_param_t param; + uint32_t i, j, num, num_sub; + odp_packet_t pkt[PKT_NUM]; + + CU_ASSERT_FATAL(odp_pool_capability(&capa) == 0); + num_sub = capa.pkt.max_num_subparam; + + CU_ASSERT_FATAL(num_sub <= ODP_POOL_MAX_SUBPARAMS); + + odp_pool_param_init(&param); + + param.type = ODP_POOL_PACKET, + param.pkt.num = PKT_NUM; + param.pkt.len = PKT_LEN; + param.pkt.num_subparam = num_sub; + + for (i = 0; i < num_sub; i++) { + param.pkt.sub[i].num = PKT_NUM; + param.pkt.sub[i].len = PKT_LEN + (i * 100); + } + + pool = odp_pool_create(NULL, &param); + + CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); + + num = 0; + + for (i = 0; i < PKT_NUM; i++) { + pkt[num] = odp_packet_alloc(pool, PKT_LEN); + CU_ASSERT(pkt[num] != ODP_PACKET_INVALID); + + if (pkt[num] != ODP_PACKET_INVALID) + num++; + } + + for (i = 0; i < num; i++) + odp_packet_free(pkt[i]); + + for (j = 0; j < num_sub; j++) { + num = 0; + + for (i = 0; i < param.pkt.sub[j].num; i++) { + pkt[num] = odp_packet_alloc(pool, param.pkt.sub[j].len); + CU_ASSERT(pkt[num] != ODP_PACKET_INVALID); + + if (pkt[num] != ODP_PACKET_INVALID) + num++; + } + + for (i = 0; i < num; i++) + odp_packet_free(pkt[i]); + } + + CU_ASSERT(odp_pool_destroy(pool) == 0); +} + odp_testinfo_t pool_suite[] = { ODP_TEST_INFO(pool_test_create_destroy_buffer), ODP_TEST_INFO(pool_test_create_destroy_packet), ODP_TEST_INFO(pool_test_create_destroy_timeout), + ODP_TEST_INFO(pool_test_alloc_packet), + ODP_TEST_INFO(pool_test_alloc_packet_subparam), ODP_TEST_INFO(pool_test_lookup_info_print), ODP_TEST_INFO_NULL, }; diff --git a/test/validation/api/pool/pool.h b/test/validation/api/pool/pool.h index 29e51763..3f8f5ebc 100644 --- a/test/validation/api/pool/pool.h +++ b/test/validation/api/pool/pool.h @@ -13,8 +13,9 @@ void pool_test_create_destroy_buffer(void); void pool_test_create_destroy_packet(void); void pool_test_create_destroy_timeout(void); -void pool_test_create_destroy_buffer_shm(void); void pool_test_lookup_info_print(void); +void pool_test_alloc_packet(void); +void pool_test_alloc_packet_subparam(void); /* test arrays: */ extern odp_testinfo_t pool_suite[]; commit 1e41d8bb45ccc1d7f5b7340742d8c9f85eb9660c Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon Oct 16 12:38:27 2017 +0300 api: pool: add packet pool subparameters Additional packet length and number specification gives more information to implementation about intended packet length distribution in the pool. This enables e.g. correct initialization when pool implementation is based on multiple fixed packet / segment sizes (subpools). The specification does require subpool implementation but allows it. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/pool.h b/include/odp/api/spec/pool.h index dc07851c..2900fc46 100644 --- a/include/odp/api/spec/pool.h +++ b/include/odp/api/spec/pool.h @@ -41,6 +41,9 @@ extern "C" { * Maximum pool name length in chars including null char */ +/** Maximum number of packet pool subparameters */ +#define ODP_POOL_MAX_SUBPARAMS 7 + /** * Pool capabilities */ @@ -134,6 +137,12 @@ typedef struct odp_pool_capability_t { * The value of zero means that limited only by the available * memory size for the pool. */ uint32_t max_uarea_size; + + /** Maximum number of subparameters + * + * Maximum number of packet pool subparameters. Valid range is + * 0 ... ODP_POOL_MAX_SUBPARAMS. */ + uint8_t max_num_subparam; } pkt; /** Timeout pool capabilities */ @@ -162,6 +171,18 @@ typedef struct odp_pool_capability_t { */ int odp_pool_capability(odp_pool_capability_t *capa); +/** + * Packet pool subparameters + */ +typedef struct odp_pool_pkt_subparam_t { + /** Number of 'len' byte packets. */ + uint32_t num; + + /** Packet length in bytes */ + uint32_t len; + +} odp_pool_pkt_subparam_t; + /** * Pool parameters * @@ -246,6 +267,33 @@ typedef struct odp_pool_param_t { capability pkt.max_headroom. Use zero if headroom is not needed. */ uint32_t headroom; + + /** Number of subparameters + * + * The number of subparameter table entries used. + * The maximum value is defined by pool + * capability pkt.max_num_subparam. The default value + * is 0. + */ + uint8_t num_subparam; + + /** Subparameter table + * + * Subparameters continue pool configuration with + * additional packet length requirements. The first + * table entry follows the num/len specification above. + * So that, sub[0].len > 'len', and sub[0].num refers + * to packet lengths between 'len' + 1 and sub[0].len. + * Similarly, sub[1] follows sub[0] specification, and + * so on. + * + * Each requirement is supported separately and may be + * rounded up, as long as the 'max_num' parameter is + * not violated. It's implementation specific if some + * requirements are supported simultaneously (e.g. + * due to subpool design). + */ + odp_pool_pkt_subparam_t sub[ODP_POOL_MAX_SUBPARAMS]; } pkt; /** Parameters for timeout pools */ commit 7c027d493295ba07fd27697827300e4c8e15475d Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Oct 13 14:41:22 2017 +0300 api: pool: relax packet pool param num Added packet pool parameter 'max_num', so that 'num' parameter can be round up by the implementation. Most implementations have a fixed segment size, and need this flexibility. For example, when 'len' is larger than the pool segment size, there may be e.g. 2 x 'num' segments in the poool, and thus it would be able to allocate 2 x 'num' small packets. When application needs to limit maximum number of packets on a pool, it can use the new max_num param for that. Otherwise, it would leave 'max_num' to zero (== no limit). Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/pool.h b/include/odp/api/spec/pool.h index 35f78377..dc07851c 100644 --- a/include/odp/api/spec/pool.h +++ b/include/odp/api/spec/pool.h @@ -164,10 +164,11 @@ int odp_pool_capability(odp_pool_capability_t *capa); /** * Pool parameters - * Used to communicate pool creation options. - * @note A single thread may not be able to allocate all 'num' elements - * from the pool at any particular time, as other threads or hardware - * blocks are allowed to keep some for caching purposes. + * + * A note for all pool types: a single thread may not be able to allocate all + * 'num' elements from the pool at any particular time, as implementations are + * allowed to store some elements (per thread and HW engine) for caching + * purposes. */ typedef struct odp_pool_param_t { /** Pool type */ @@ -192,17 +193,34 @@ typedef struct odp_pool_param_t { /** Parameters for packet pools */ struct { - /** The number of packets that the pool must provide - that are packet length 'len' bytes or smaller. - The maximum value is defined by pool capability - pkt.max_num. */ + /** Minimum number of 'len' byte packets. + * + * The pool must contain at least this many packets + * that are 'len' bytes or smaller. An implementation + * may round up the value, as long as the 'max_num' + * parameter below is not violated. The maximum value + * for this field is defined by pool capability + * pkt.max_num. + */ uint32_t num; - /** Minimum packet length that the pool must provide - 'num' packets. The number of packets may be less - than 'num' when packets are larger than 'len'. - The maximum value is defined by pool capability - pkt.max_len. Use 0 for default. */ + /** Maximum number of packets. + * + * This is the maximum number of packets of any length + * that can be allocated from the pool. The maximum + * value is defined by pool capability pkt.max_num. + * Use 0 when there's no requirement for the maximum + * number of packets. The default value is 0. + */ + uint32_t max_num; + + /** Minimum length of 'num' packets. + * + * The pool must contain at least 'num' packets up to + * this packet length (1 ... 'len' bytes). The maximum + * value for this field is defined by pool capability + * pkt.max_len. Use 0 for default. + */ uint32_t len; /** Maximum packet length that will be allocated from ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/pool.h | 236 +++++++++++++++++++++++++------------- platform/linux-generic/odp_pool.c | 3 + test/validation/api/pool/pool.c | 213 +++++++++++++++++++++++++++------- test/validation/api/pool/pool.h | 4 +- 4 files changed, 333 insertions(+), 123 deletions(-) hooks/post-receive --

8 years, 2 months

[COMMIT] branch api-next updated. v1.16.0.0-634-gbdb7cbf6

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via bdb7cbf620ada8682c89b5ae5a97cb84f16c0ed0 (commit) via e4b4bab2247e7724fb4b5983e54fd62676f1d206 (commit) via 22441cdcb569d5c6147db5d67e62fde67a3daad5 (commit) via 2ae5d875aab20e728c231361af95e1c57336daa5 (commit) via c370d7950524a968bbc148644f7c5fc619c78600 (commit) via 28a3b9e30fb4e8784a8781e06e28d3f175e05749 (commit) from ad990bbf88d95b2a4f9583b7fda718bf5d7d4212 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit bdb7cbf620ada8682c89b5ae5a97cb84f16c0ed0 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Nov 16 15:07:42 2017 +0200 api: pktio: clean up doxygen tags Remove [in] from @param tags as by default parameters are input only. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/packet_io.h b/include/odp/api/spec/packet_io.h index a9a39a64..60d13043 100644 --- a/include/odp/api/spec/packet_io.h +++ b/include/odp/api/spec/packet_io.h @@ -954,8 +954,8 @@ uint32_t ODP_DEPRECATE(odp_pktio_mtu)(odp_pktio_t pktio); /** * Enable/Disable promiscuous mode on a packet IO interface. * - * @param[in] pktio Packet IO handle. - * @param[in] enable 1 to enable, 0 to disable. + * @param pktio Packet IO handle. + * @param enable 1 to enable, 0 to disable. * * @retval 0 on success * @retval <0 on failure @@ -965,7 +965,7 @@ int odp_pktio_promisc_mode_set(odp_pktio_t pktio, odp_bool_t enable); /** * Determine if promiscuous mode is enabled for a packet IO interface. * - * @param[in] pktio Packet IO handle. + * @param pktio Packet IO handle. * * @retval 1 if promiscuous mode is enabled. * @retval 0 if promiscuous mode is disabled. @@ -1034,14 +1034,13 @@ int odp_pktio_mac_addr_set(odp_pktio_t pktio, const void *mac_addr, /** * Setup per-port default class-of-service. * - * @param[in] pktio Ingress port pktio handle. - * @param[in] default_cos Class-of-service set to all packets arriving - * at this ingress port, - * unless overridden by subsequent - * header-based filters. + * @param pktio Ingress port pktio handle. + * @param default_cos Class-of-service set to all packets arriving at this + * ingress port, unless overridden by subsequent + * header-based filters. * - * @retval 0 on success - * @retval <0 on failure + * @retval 0 on success + * @retval <0 on failure * * @note The default_cos has to be unique per odp_pktio_t instance. */ @@ -1050,12 +1049,12 @@ int odp_pktio_default_cos_set(odp_pktio_t pktio, odp_cos_t default_cos); /** * Setup per-port error class-of-service * - * @param[in] pktio Ingress port pktio handle. - * @param[in] error_cos class-of-service set to all packets arriving - * at this ingress port that contain an error. + * @param pktio Ingress port pktio handle. + * @param error_cos class-of-service set to all packets arriving at this + * ingress port that contain an error. * - * @retval 0 on success - * @retval <0 on failure + * @retval 0 on success + * @retval <0 on failure * * @note Optional. */ @@ -1064,24 +1063,23 @@ int odp_pktio_error_cos_set(odp_pktio_t pktio, odp_cos_t error_cos); /** * Setup per-port header offset * - * @param[in] pktio Ingress port pktio handle. - * @param[in] offset Number of bytes the classifier must skip. + * @param pktio Ingress port pktio handle. + * @param offset Number of bytes the classifier must skip. * - * @retval 0 on success - * @retval <0 on failure - * @note Optional. + * @retval 0 on success + * @retval <0 on failure * + * @note Optional. */ int odp_pktio_skip_set(odp_pktio_t pktio, uint32_t offset); /** * Specify per-port buffer headroom * - * @param[in] pktio Ingress port pktio handle. - * @param[in] headroom Number of bytes of space preceding - * packet data to reserve for use as headroom. - * Must not exceed the implementation - * defined ODP_PACKET_MAX_HEADROOM. + * @param pktio Ingress port pktio handle. + * @param headroom Number of bytes of space preceding packet data to reserve + * for use as headroom. Must not exceed the implementation + * defined ODP_PACKET_MAX_HEADROOM. * * @retval 0 on success * @retval <0 on failure commit e4b4bab2247e7724fb4b5983e54fd62676f1d206 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Nov 16 14:25:10 2017 +0200 linux-gen: dpdk: fix maximum frame length value Returns maximum ethernet frame size instead of maximum IP packet MTU. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index ccccc0a8..d0a238aa 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -842,6 +842,13 @@ static uint32_t dpdk_mtu_get(pktio_entry_t *pktio_entry) return mtu; } +static uint32_t dpdk_frame_maxlen(pktio_entry_t *pktio_entry) +{ + pkt_dpdk_t *pkt_dpdk = &pktio_entry->s.pkt_dpdk; + + return pkt_dpdk->mtu; +} + static int dpdk_vdev_promisc_mode_get(uint8_t port_id) { struct rte_eth_dev_info dev_info; @@ -1654,7 +1661,7 @@ const pktio_if_ops_t dpdk_pktio_ops = { .recv = dpdk_recv, .send = dpdk_send, .link_status = dpdk_link_status, - .mtu_get = dpdk_mtu_get, + .mtu_get = dpdk_frame_maxlen, .promisc_mode_set = dpdk_promisc_mode_set, .promisc_mode_get = dpdk_promisc_mode_get, .mac_get = dpdk_mac_addr_get, commit 22441cdcb569d5c6147db5d67e62fde67a3daad5 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Nov 16 14:23:08 2017 +0200 test: l2fwd: add verbose option Added verbose command line option. When enabled, pktio interface details are printed after open. This can be used for debugging interface configuration. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c index 42d8f49a..2daf0e2d 100644 --- a/test/performance/odp_l2fwd.c +++ b/test/performance/odp_l2fwd.c @@ -108,6 +108,7 @@ typedef struct { int error_check; /**< Check packet errors */ int sched_mode; /**< Scheduler mode */ int num_groups; /**< Number of scheduling groups */ + int verbose; /**< Verbose output */ } appl_args_t; static int exit_threads; /**< Break workers loop if set to 1 */ @@ -697,6 +698,9 @@ static int create_pktio(const char *dev, int idx, int num_rx, int num_tx, printf("created pktio %" PRIu64 ", dev: %s, drv: %s\n", odp_pktio_to_u64(pktio), dev, info.drv_name); + if (gbl_args->appl.verbose) + odp_pktio_print(pktio); + if (odp_pktio_capability(pktio, &capa)) { LOG_ERR("Error: capability query failed %s\n", dev); return -1; @@ -1163,11 +1167,12 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) {"src_change", required_argument, NULL, 's'}, {"error_check", required_argument, NULL, 'e'}, {"groups", required_argument, NULL, 'g'}, + {"verbose", no_argument, NULL, 'v'}, {"help", no_argument, NULL, 'h'}, {NULL, 0, NULL, 0} }; - static const char *shortopts = "+c:+t:+a:i:m:o:r:d:s:e:g:h"; + static const char *shortopts = "+c:+t:+a:i:m:o:r:d:s:e:g:vh"; /* let helper collect its own arguments (e.g. --odph_proc) */ odph_parse_options(argc, argv, shortopts, longopts); @@ -1178,6 +1183,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) appl_args->src_change = 1; /* change eth src address by default */ appl_args->num_groups = 0; /* use default group */ appl_args->error_check = 0; /* don't check packet errors by default */ + appl_args->verbose = 0; opterr = 0; /* do not issue errors on helper options */ @@ -1305,6 +1311,9 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) case 'g': appl_args->num_groups = atoi(optarg); break; + case 'v': + appl_args->verbose = 1; + break; case 'h': usage(argv[0]); exit(EXIT_SUCCESS); commit 2ae5d875aab20e728c231361af95e1c57336daa5 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Nov 16 13:53:10 2017 +0200 api: pktio: deprecate odp_pktio_mtu MTU is not a well defined term for link layer maximum receive and transmit frame sizes. Use odp_pktin_maxlen() and odp_pktout_maxlen() instead. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/packet_io.h b/include/odp/api/spec/packet_io.h index b09c9cfc..a9a39a64 100644 --- a/include/odp/api/spec/packet_io.h +++ b/include/odp/api/spec/packet_io.h @@ -30,7 +30,7 @@ extern "C" { * * Packet IO is the Ingress and Egress interface to ODP processing. It * allows manipulation of the interface for setting such attributes as - * the mtu, mac etc. + * number of queues, MAC address etc. * Pktio is usually followed by the classifier and a default class COS * can be set so that the scheduler may distribute flows. The interface * may be used directly in polled mode with odp_pktin_recv() and @@ -938,14 +938,18 @@ int odp_pktout_send(odp_pktout_queue_t queue, const odp_packet_t packets[], int num); /** - * Return the currently configured MTU value of a packet IO interface. + * MTU value of a packet IO interface * - * @param[in] pktio Packet IO handle. + * @deprecated Use odp_pktin_maxlen() and odp_pktout_maxlen() instead. MTU was + * not well defined. There may be difference between MTU and maximum frame + * length values. + * + * @param pktio Packet IO handle. * * @return MTU value on success * @retval 0 on failure */ -uint32_t odp_pktio_mtu(odp_pktio_t pktio); +uint32_t ODP_DEPRECATE(odp_pktio_mtu)(odp_pktio_t pktio); /** * Enable/Disable promiscuous mode on a packet IO interface. diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index cf65e723..aa6cdb06 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -803,7 +803,7 @@ static inline uint32_t pktio_mtu(odp_pktio_t hdl) return ret; } -uint32_t odp_pktio_mtu(odp_pktio_t pktio) +uint32_t ODP_DEPRECATE(odp_pktio_mtu)(odp_pktio_t pktio) { return pktio_mtu(pktio); } diff --git a/test/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c index 004379cd..39451de3 100644 --- a/test/validation/api/pktio/pktio.c +++ b/test/validation/api/pktio/pktio.c @@ -617,13 +617,13 @@ static void pktio_txrx_multi(pktio_info_t *pktio_a, pktio_info_t *pktio_b, if (packet_len == USE_MTU) { odp_pool_capability_t pool_capa; - uint32_t mtu; + uint32_t maxlen; - mtu = odp_pktio_mtu(pktio_a->id); - if (odp_pktio_mtu(pktio_b->id) < mtu) - mtu = odp_pktio_mtu(pktio_b->id); - CU_ASSERT_FATAL(mtu > 0); - packet_len = mtu; + maxlen = odp_pktout_maxlen(pktio_a->id); + if (odp_pktout_maxlen(pktio_b->id) < maxlen) + maxlen = odp_pktout_maxlen(pktio_b->id); + CU_ASSERT_FATAL(maxlen > 0); + packet_len = maxlen; if (packet_len > PKT_LEN_MAX) packet_len = PKT_LEN_MAX; @@ -1026,16 +1026,21 @@ void pktio_test_recv_mtu(void) void pktio_test_mtu(void) { int ret; - uint32_t mtu; + uint32_t maxlen; odp_pktio_t pktio = create_pktio(0, ODP_PKTIN_MODE_SCHED, ODP_PKTOUT_MODE_DIRECT); CU_ASSERT_FATAL(pktio != ODP_PKTIO_INVALID); - mtu = odp_pktio_mtu(pktio); - CU_ASSERT(mtu > 0); + maxlen = odp_pktout_maxlen(pktio); + CU_ASSERT(maxlen > 0); - printf(" %" PRIu32 " ", mtu); + printf(" %" PRIu32 " ", maxlen); + + maxlen = odp_pktin_maxlen(pktio); + CU_ASSERT(maxlen > 0); + + printf(" %" PRIu32 " ", maxlen); ret = odp_pktio_close(pktio); CU_ASSERT(ret == 0); @@ -1706,14 +1711,14 @@ void pktio_test_start_stop(void) /* * This is a pre-condition check that the pktio_test_send_failure() - * test case can be run. If the TX interface MTU is larger that the + * test case can be run. If the TX interface max frame len is larger that the * biggest packet we can allocate then the test won't be able to - * attempt to send packets larger than the MTU, so skip the test. + * attempt to send packets larger than the max len, so skip the test. */ int pktio_check_send_failure(void) { odp_pktio_t pktio_tx; - uint32_t mtu; + uint32_t maxlen; odp_pktio_param_t pktio_param; int iface_idx = 0; const char *iface = iface_name[iface_idx]; @@ -1734,14 +1739,14 @@ int pktio_check_send_failure(void) return ODP_TEST_INACTIVE; } - /* read the MTU from the transmit interface */ - mtu = odp_pktio_mtu(pktio_tx); + /* read the maxlen from the transmit interface */ + maxlen = odp_pktout_maxlen(pktio_tx); odp_pktio_close(pktio_tx); /* Failure test supports only single segment */ if (pool_capa.pkt.max_seg_len && - pool_capa.pkt.max_seg_len < mtu + 32) + pool_capa.pkt.max_seg_len < maxlen + 32) return ODP_TEST_INACTIVE; return ODP_TEST_ACTIVE; @@ -1753,7 +1758,7 @@ void pktio_test_send_failure(void) odp_packet_t pkt_tbl[TX_BATCH_LEN]; uint32_t pkt_seq[TX_BATCH_LEN]; int ret, i, alloc_pkts; - uint32_t mtu; + uint32_t maxlen; odp_pool_param_t pool_params; odp_pool_t pkt_pool; int long_pkt_idx = TX_BATCH_LEN / 2; @@ -1770,8 +1775,8 @@ void pktio_test_send_failure(void) CU_ASSERT_FATAL(odp_pktout_queue(pktio_tx, &pktout, 1) == 1); - /* read the MTU from the transmit interface */ - mtu = odp_pktio_mtu(pktio_tx); + /* read maxlen from the transmit interface */ + maxlen = odp_pktout_maxlen(pktio_tx); ret = odp_pktio_start(pktio_tx); CU_ASSERT_FATAL(ret == 0); @@ -1781,15 +1786,15 @@ void pktio_test_send_failure(void) CU_ASSERT_FATAL(odp_pool_capability(&pool_capa) == 0); if (pool_capa.pkt.max_seg_len && - pool_capa.pkt.max_seg_len < mtu + 32) { + pool_capa.pkt.max_seg_len < maxlen + 32) { CU_FAIL("Max packet seg length is too small."); return; } /* configure the pool so that we can generate test packets larger - * than the interface MTU */ + * than the interface max transmit length */ odp_pool_param_init(&pool_params); - pool_params.pkt.len = mtu + 32; + pool_params.pkt.len = maxlen + 32; pool_params.pkt.seg_len = pool_params.pkt.len; pool_params.pkt.num = TX_BATCH_LEN + 1; pool_params.type = ODP_POOL_PACKET; commit c370d7950524a968bbc148644f7c5fc619c78600 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu Nov 16 10:56:34 2017 +0200 linux-gen: pktio: implement frame length Use mtu to implement frame length functions. Various packet IO devices mtu functions need to be still updated to return correct frame length values. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 5f7da263..cf65e723 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -777,7 +777,7 @@ void sched_cb_pktio_stop_finalize(int pktio_index) unlock_entry(entry); } -uint32_t odp_pktio_mtu(odp_pktio_t hdl) +static inline uint32_t pktio_mtu(odp_pktio_t hdl) { pktio_entry_t *entry; uint32_t ret = 0; @@ -803,6 +803,21 @@ uint32_t odp_pktio_mtu(odp_pktio_t hdl) return ret; } +uint32_t odp_pktio_mtu(odp_pktio_t pktio) +{ + return pktio_mtu(pktio); +} + +uint32_t odp_pktin_maxlen(odp_pktio_t pktio) +{ + return pktio_mtu(pktio); +} + +uint32_t odp_pktout_maxlen(odp_pktio_t pktio) +{ + return pktio_mtu(pktio); +} + int odp_pktio_promisc_mode_set(odp_pktio_t hdl, odp_bool_t enable) { pktio_entry_t *entry; @@ -1089,8 +1104,11 @@ void odp_pktio_print(odp_pktio_t hdl) " mac %02x:%02x:%02x:%02x:%02x:%02x\n", addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]); len += snprintf(&str[len], n - len, - " mtu %" PRIu32 "\n", - odp_pktio_mtu(hdl)); + " pktin maxlen %" PRIu32 "\n", + odp_pktin_maxlen(hdl)); + len += snprintf(&str[len], n - len, + " pktout maxlen %" PRIu32 "\n", + odp_pktout_maxlen(hdl)); len += snprintf(&str[len], n - len, " promisc %s\n", odp_pktio_promisc_mode(hdl) ? "yes" : "no"); commit 28a3b9e30fb4e8784a8781e06e28d3f175e05749 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Nov 15 17:19:33 2017 +0200 api: pktio: add max frame length Added functions to request maximum packet input and output frame lengths. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/packet_io.h b/include/odp/api/spec/packet_io.h index 6e4f8810..b09c9cfc 100644 --- a/include/odp/api/spec/packet_io.h +++ b/include/odp/api/spec/packet_io.h @@ -969,6 +969,36 @@ int odp_pktio_promisc_mode_set(odp_pktio_t pktio, odp_bool_t enable); */ int odp_pktio_promisc_mode(odp_pktio_t pktio); +/** + * Maximum frame length at packet input + * + * Maximum frame length in bytes that the packet IO interface can receive. + * For Ethernet, the frame length bytes start with MAC addresses and continue + * to the end of the payload. So, Ethernet checksum, interpacket gap + * and preamble bytes are excluded from the length. + * + * @param pktio Packet IO handle. + * + * @return Maximum frame length at packet input + * @retval 0 on failure + */ +uint32_t odp_pktin_maxlen(odp_pktio_t pktio); + +/** + * Maximum frame length at packet output + * + * Maximum frame length in bytes that the packet IO interface can transmit. + * For Ethernet, the frame length bytes start with MAC addresses and continue + * to the end of the payload. So, Ethernet checksum, interpacket gap + * and preamble bytes are excluded from the length. + * + * @param pktio Packet IO handle. + * + * @return Maximum frame length at packet output + * @retval 0 on failure + */ +uint32_t odp_pktout_maxlen(odp_pktio_t pktio); + /** * Get the default MAC address of a packet IO interface. * ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/packet_io.h | 90 +++++++++++++++++++++++----------- platform/linux-generic/odp_packet_io.c | 24 +++++++-- platform/linux-generic/pktio/dpdk.c | 9 +++- test/performance/odp_l2fwd.c | 11 ++++- test/validation/api/pktio/pktio.c | 49 +++++++++--------- 5 files changed, 127 insertions(+), 56 deletions(-) hooks/post-receive --

8 years, 2 months

[COMMIT] branch api-next updated. v1.16.0.0-628-gad990bbf

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via ad990bbf88d95b2a4f9583b7fda718bf5d7d4212 (commit) via d6be400839611af3ca47baa85e8fed12d0c87e29 (commit) via d2a70019d5fb5443f80a4896dd30b710d3988e8e (commit) via 2526489e826f49dede472782621c0e0ba8976745 (commit) via 8ff99a64d79b6e3e350037575b9d5bc9adeca267 (commit) from 4cb02e1caccb9179575e95448fd46979e17d0905 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ad990bbf88d95b2a4f9583b7fda718bf5d7d4212 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Nov 24 14:17:16 2017 +0200 validation: time: test odp_time_diff_ns Added tests for the new time difference in nsec function. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/time/time.c b/test/validation/api/time/time.c index ef137257..c8f90dba 100644 --- a/test/validation/api/time/time.c +++ b/test/validation/api/time/time.c @@ -201,7 +201,8 @@ static void time_test_diff(time_cb time_cur, /* volatile to stop optimization of busy loop */ volatile int count = 0; odp_time_t diff, t1, t2; - uint64_t nsdiff, ns1, ns2, ns; + uint64_t ns1, ns2, ns; + uint64_t nsdiff, diff_ns; uint64_t upper_limit, lower_limit; /* test timestamp diff */ @@ -217,6 +218,9 @@ static void time_test_diff(time_cb time_cur, diff = odp_time_diff(t2, t1); CU_ASSERT(odp_time_cmp(diff, ODP_TIME_NULL) > 0); + diff_ns = odp_time_diff_ns(t2, t1); + CU_ASSERT(diff_ns > 0); + ns1 = odp_time_to_ns(t1); ns2 = odp_time_to_ns(t2); ns = ns2 - ns1; @@ -225,6 +229,7 @@ static void time_test_diff(time_cb time_cur, upper_limit = ns + 2 * res; lower_limit = ns - 2 * res; CU_ASSERT((nsdiff <= upper_limit) && (nsdiff >= lower_limit)); + CU_ASSERT((diff_ns <= upper_limit) && (diff_ns >= lower_limit)); /* test timestamp and interval diff */ ns1 = 54; @@ -233,11 +238,16 @@ static void time_test_diff(time_cb time_cur, diff = odp_time_diff(t2, t1); CU_ASSERT(odp_time_cmp(diff, ODP_TIME_NULL) > 0); + + diff_ns = odp_time_diff_ns(t2, t1); + CU_ASSERT(diff_ns > 0); + nsdiff = odp_time_to_ns(diff); upper_limit = ns + 2 * res; lower_limit = ns - 2 * res; CU_ASSERT((nsdiff <= upper_limit) && (nsdiff >= lower_limit)); + CU_ASSERT((diff_ns <= upper_limit) && (diff_ns >= lower_limit)); /* test interval diff */ ns2 = 60 * 10 * ODP_TIME_SEC_IN_NS; @@ -246,11 +256,16 @@ static void time_test_diff(time_cb time_cur, t2 = time_from_ns(ns2); diff = odp_time_diff(t2, t1); CU_ASSERT(odp_time_cmp(diff, ODP_TIME_NULL) > 0); + + diff_ns = odp_time_diff_ns(t2, t1); + CU_ASSERT(diff_ns > 0); + nsdiff = odp_time_to_ns(diff); upper_limit = ns + 2 * res; lower_limit = ns - 2 * res; CU_ASSERT((nsdiff <= upper_limit) && (nsdiff >= lower_limit)); + CU_ASSERT((diff_ns <= upper_limit) && (diff_ns >= lower_limit)); /* same time has to diff to 0 */ diff = odp_time_diff(t2, t2); @@ -258,6 +273,9 @@ static void time_test_diff(time_cb time_cur, diff = odp_time_diff(t2, ODP_TIME_NULL); CU_ASSERT(odp_time_cmp(t2, diff) == 0); + + diff_ns = odp_time_diff_ns(t2, t2); + CU_ASSERT(diff_ns == 0); } void time_test_local_diff(void) commit d6be400839611af3ca47baa85e8fed12d0c87e29 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Nov 24 14:07:56 2017 +0200 linux-gen: time: implement odp_time_diff_ns Implemented the new diff in nsec function. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_time.c b/platform/linux-generic/odp_time.c index 0df4682c..04fedf5f 100644 --- a/platform/linux-generic/odp_time.c +++ b/platform/linux-generic/odp_time.c @@ -228,6 +228,15 @@ odp_time_t odp_time_diff(odp_time_t t2, odp_time_t t1) return time; } +uint64_t odp_time_diff_ns(odp_time_t t2, odp_time_t t1) +{ + odp_time_t time; + + time.u64 = t2.u64 - t1.u64; + + return time_to_ns(time); +} + uint64_t odp_time_to_ns(odp_time_t time) { return time_to_ns(time); commit d2a70019d5fb5443f80a4896dd30b710d3988e8e Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Nov 24 14:00:28 2017 +0200 api: time: time difference in nsec Added function which returns time difference in nanoseconds. This short cuts a common pattern... t1 = odp_time_global(); foo(); t2 = odp_time_global(); printf("foo() takes %u nsec\n", odp_time_diff_ns(t2, t1); ... by combining convert and diff functions. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/time.h b/include/odp/api/spec/time.h index 29175eb5..50082f53 100644 --- a/include/odp/api/spec/time.h +++ b/include/odp/api/spec/time.h @@ -76,6 +76,16 @@ odp_time_t odp_time_global(void); */ odp_time_t odp_time_diff(odp_time_t t2, odp_time_t t1); +/** + * Time difference in nanoseconds + * + * @param t2 Second time stamp + * @param t1 First time stamp + * + * @return Difference of time stamps (t2 - t1) in nanoseconds + */ +uint64_t odp_time_diff_ns(odp_time_t t2, odp_time_t t1); + /** * Time sum * commit 2526489e826f49dede472782621c0e0ba8976745 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Nov 28 16:26:10 2017 +0300 api: linux-gen: ipsec: constify in/out params Mark all input and out params as constants Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index 0be9664e..d57815ed 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -1027,13 +1027,13 @@ typedef struct odp_ipsec_out_param_t { int num_opt; /** Pointer to an array of IPSEC SAs */ - odp_ipsec_sa_t *sa; + const odp_ipsec_sa_t *sa; /** Pointer to an array of outbound operation options * * May be NULL when num_opt is zero. */ - odp_ipsec_out_opt_t *opt; + const odp_ipsec_out_opt_t *opt; } odp_ipsec_out_param_t; @@ -1061,7 +1061,7 @@ typedef struct odp_ipsec_in_param_t { * * May be NULL when num_sa is zero. */ - odp_ipsec_sa_t *sa; + const odp_ipsec_sa_t *sa; } odp_ipsec_in_param_t; diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index b17e4cd7..18ae8ece 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -582,7 +582,7 @@ uint32_t ipsec_seq_no(ipsec_sa_t *ipsec_sa) static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt, odp_ipsec_sa_t sa, odp_packet_t *pkt_out, - odp_ipsec_out_opt_t *opt ODP_UNUSED, + const odp_ipsec_out_opt_t *opt ODP_UNUSED, odp_ipsec_op_status_t *status) { ipsec_sa_t *ipsec_sa = NULL; @@ -998,7 +998,7 @@ int odp_ipsec_in(const odp_packet_t pkt_in[], int num_in, return in_pkt; } -static odp_ipsec_out_opt_t default_opt = { +static const odp_ipsec_out_opt_t default_opt = { .mode = ODP_IPSEC_FRAG_DISABLED, }; @@ -1022,7 +1022,7 @@ int odp_ipsec_out(const odp_packet_t pkt_in[], int num_in, odp_ipsec_sa_t sa; ipsec_sa_t *ipsec_sa; odp_ipsec_packet_result_t *result; - odp_ipsec_out_opt_t *opt; + const odp_ipsec_out_opt_t *opt; memset(&status, 0, sizeof(status)); @@ -1130,7 +1130,7 @@ int odp_ipsec_out_enq(const odp_packet_t pkt_in[], int num_in, odp_ipsec_sa_t sa; ipsec_sa_t *ipsec_sa; odp_ipsec_packet_result_t *result; - odp_ipsec_out_opt_t *opt; + const odp_ipsec_out_opt_t *opt; odp_queue_t queue; memset(&status, 0, sizeof(status)); @@ -1222,7 +1222,7 @@ int odp_ipsec_out_inline(const odp_packet_t pkt_in[], int num_in, odp_ipsec_sa_t sa; ipsec_sa_t *ipsec_sa; odp_ipsec_packet_result_t *result; - odp_ipsec_out_opt_t *opt; + const odp_ipsec_out_opt_t *opt; uint32_t hdr_len, offset; const void *ptr; commit 8ff99a64d79b6e3e350037575b9d5bc9adeca267 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Nov 28 15:37:18 2017 +0300 api: ipsec: add capabilities for fragmentation support It is expected that implementation can support any combination of fragmentatation (after, before, both or none). Add capabilities to report such support to application. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index 4a33af8e..0be9664e 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -260,6 +260,12 @@ typedef struct odp_ipsec_capability_t { /** IP Authenticated Header (ODP_IPSEC_AH) support */ odp_support_t proto_ah; + /** Fragment after IPsec support */ + odp_support_t frag_after; + + /** Fragment before IPsec support */ + odp_support_t frag_before; + /** * Support of pipelined classification (ODP_IPSEC_PIPELINE_CLS) of * resulting inbound packets ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/ipsec.h | 12 +++++++++--- include/odp/api/spec/time.h | 10 ++++++++++ platform/linux-generic/odp_ipsec.c | 10 +++++----- platform/linux-generic/odp_time.c | 9 +++++++++ test/validation/api/time/time.c | 20 +++++++++++++++++++- 5 files changed, 52 insertions(+), 9 deletions(-) hooks/post-receive --

8 years, 2 months

[COMMIT] branch 2.0 updated. v1.15.0.0-939-g00c7441f

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, 2.0 has been updated via 00c7441fae53949dd87855d48102f932f8f64537 (commit) via ff5ecde9f73158f00df5df7da6f6ceb9ad4fe0f2 (commit) via cb4d057c0f35fbd9855c4b4a08481aab69be3e07 (commit) via f47262a495ce304a924a3c5eb00eb349faeb3666 (commit) via 9126cea4346f5b715e335a54b9d72ec89533187a (commit) via 8c1cb083f8bacd0c1fe56a759591ff7e0633be37 (commit) via 0e8647378bfbe730101e5f089e134356dea00cda (commit) from 7074b71b266de9c4eb5bf03513186a72ea27b2bc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 00c7441fae53949dd87855d48102f932f8f64537 Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Fri Nov 24 10:25:19 2017 +0200 doc: application-api-guide: exclude subsystem files Exclude subsystem files form application API guide document. Documentation will be added when API will be stable. Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/doc/application-api-guide/Doxyfile b/doc/application-api-guide/Doxyfile index 2709f6fd..05415849 100644 --- a/doc/application-api-guide/Doxyfile +++ b/doc/application-api-guide/Doxyfile @@ -5,6 +5,7 @@ PROJECT_NUMBER = $(VERSION) PROJECT_LOGO = $(SRCDIR)/doc/images/ODP-Logo-HQ.svg INPUT = $(SRCDIR)/doc/application-api-guide \ $(SRCDIR)/include +EXCLUDE = $(SRCDIR)/include/subsystem EXCLUDE_PATTERNS = drv* odp_drv.h EXAMPLE_PATH = $(SRCDIR)/example $(SRCDIR) WARNINGS = NO commit ff5ecde9f73158f00df5df7da6f6ceb9ad4fe0f2 Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Thu Nov 23 16:51:21 2017 +0200 linux-gen: modular-framework: move schedule subsystem header to a public folder Move schedule subsystem header to a public folder. Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/include/Makefile.am b/include/Makefile.am index 4436c61b..b7c31c1f 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -72,7 +72,8 @@ subsystemspecincludedir= $(includedir)/subsystem/spec subsystemspecinclude_HEADERS = \ subsystem/spec/buffer_subsystem.h \ subsystem/spec/pool_subsystem.h \ - subsystem/spec/queue_subsystem.h + subsystem/spec/queue_subsystem.h \ + subsystem/spec/schedule_subsystem.h odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi odpapiabidefaultinclude_HEADERS = \ diff --git a/platform/linux-generic/include/odp_schedule_subsystem.h b/include/subsystem/spec/schedule_subsystem.h similarity index 100% rename from platform/linux-generic/include/odp_schedule_subsystem.h rename to include/subsystem/spec/schedule_subsystem.h diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am index 7742aea3..6dde37b9 100644 --- a/platform/linux-dpdk/Makefile.am +++ b/platform/linux-dpdk/Makefile.am @@ -214,7 +214,6 @@ noinst_HEADERS = \ ${top_srcdir}/platform/linux-generic/include/odp_queue_if.h \ ${top_srcdir}/platform/linux-generic/include/odp_ring_internal.h \ ${top_srcdir}/platform/linux-generic/include/odp_schedule_if.h \ - ${top_srcdir}/platform/linux-generic/include/odp_schedule_subsystem.h \ ${top_srcdir}/platform/linux-generic/include/odp_sorted_list_internal.h \ ${top_srcdir}/platform/linux-generic/include/odp_shm_internal.h \ ${top_srcdir}/platform/linux-generic/include/odp_time_internal.h \ diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 47de83f9..8813aea9 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -199,7 +199,6 @@ noinst_HEADERS = \ include/odp_schedule_scalable.h \ include/odp_schedule_scalable_config.h \ include/odp_schedule_scalable_ordered.h \ - include/odp_schedule_subsystem.h \ include/odp_sorted_list_internal.h \ include/odp_shm_internal.h \ include/odp_time_internal.h \ diff --git a/platform/linux-generic/schedule/generic.c b/platform/linux-generic/schedule/generic.c index 73fef40c..e2276285 100644 --- a/platform/linux-generic/schedule/generic.c +++ b/platform/linux-generic/schedule/generic.c @@ -25,7 +25,7 @@ #include <odp/api/packet_io.h> #include <odp_ring_internal.h> #include <odp_timer_internal.h> -#include <odp_schedule_subsystem.h> +#include <subsystem/spec/schedule_subsystem.h> #include <odp_packet_io_internal.h> /* Should remove this dependency */ diff --git a/platform/linux-generic/schedule/iquery.c b/platform/linux-generic/schedule/iquery.c index 5de22983..76d96ff5 100644 --- a/platform/linux-generic/schedule/iquery.c +++ b/platform/linux-generic/schedule/iquery.c @@ -25,7 +25,7 @@ #include <odp/api/packet_io.h> #include <odp_config_internal.h> #include <odp_timer_internal.h> -#include <odp_schedule_subsystem.h> +#include <subsystem/spec/schedule_subsystem.h> #include <odp_packet_io_internal.h> /* Should remove this dependency */ diff --git a/platform/linux-generic/schedule/scalable.c b/platform/linux-generic/schedule/scalable.c index d8f53820..de9c6528 100644 --- a/platform/linux-generic/schedule/scalable.c +++ b/platform/linux-generic/schedule/scalable.c @@ -29,7 +29,7 @@ #include <odp_llqueue.h> #include <odp_queue_scalable_internal.h> #include <odp_schedule_if.h> -#include <odp_schedule_subsystem.h> +#include <subsystem/spec/schedule_subsystem.h> #include <odp_bitset.h> #include <odp_packet_io_internal.h> diff --git a/platform/linux-generic/schedule/sp.c b/platform/linux-generic/schedule/sp.c index ea7b8342..06e2a144 100644 --- a/platform/linux-generic/schedule/sp.c +++ b/platform/linux-generic/schedule/sp.c @@ -18,7 +18,7 @@ #include <odp_config_internal.h> #include <odp_ring_internal.h> #include <odp_timer_internal.h> -#include <odp_schedule_subsystem.h> +#include <subsystem/spec/schedule_subsystem.h> #include <odp_packet_io_internal.h> #include <odp_queue_internal.h> diff --git a/platform/linux-generic/schedule/subsystem.c b/platform/linux-generic/schedule/subsystem.c index ba9a095f..516cdf3b 100644 --- a/platform/linux-generic/schedule/subsystem.c +++ b/platform/linux-generic/schedule/subsystem.c @@ -15,7 +15,7 @@ #include <odp_debug_internal.h> #include <odp_internal.h> #include <odp_module.h> -#include <odp_schedule_subsystem.h> +#include <subsystem/spec/schedule_subsystem.h> ODP_SUBSYSTEM_DEFINE(schedule, "schedule public APIs", SCHEDULE_SUBSYSTEM_VERSION); commit cb4d057c0f35fbd9855c4b4a08481aab69be3e07 Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Thu Nov 23 15:54:40 2017 +0200 linux-gen: modular-framework: move queue subsystem header to a public folder Move queue subsystem header to a public folder. Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/include/Makefile.am b/include/Makefile.am index 6bb497dc..4436c61b 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -71,7 +71,8 @@ odpdrvspecinclude_HEADERS = \ subsystemspecincludedir= $(includedir)/subsystem/spec subsystemspecinclude_HEADERS = \ subsystem/spec/buffer_subsystem.h \ - subsystem/spec/pool_subsystem.h + subsystem/spec/pool_subsystem.h \ + subsystem/spec/queue_subsystem.h odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi odpapiabidefaultinclude_HEADERS = \ diff --git a/platform/linux-generic/include/odp_queue_subsystem.h b/include/subsystem/spec/queue_subsystem.h similarity index 100% rename from platform/linux-generic/include/odp_queue_subsystem.h rename to include/subsystem/spec/queue_subsystem.h diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am index f188c377..7742aea3 100644 --- a/platform/linux-dpdk/Makefile.am +++ b/platform/linux-dpdk/Makefile.am @@ -212,7 +212,6 @@ noinst_HEADERS = \ ${srcdir}/include/odp_posix_extensions.h \ ${top_srcdir}/platform/linux-generic/include/odp_queue_internal.h \ ${top_srcdir}/platform/linux-generic/include/odp_queue_if.h \ - ${top_srcdir}/platform/linux-generic/include/odp_queue_subsystem.h \ ${top_srcdir}/platform/linux-generic/include/odp_ring_internal.h \ ${top_srcdir}/platform/linux-generic/include/odp_schedule_if.h \ ${top_srcdir}/platform/linux-generic/include/odp_schedule_subsystem.h \ diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 745b86ba..47de83f9 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -189,7 +189,6 @@ noinst_HEADERS = \ include/odp_pktio_ops_tap.h \ include/odp_pktio_ops_subsystem.h \ include/odp_pkt_queue_internal.h \ - include/odp_queue_subsystem.h \ include/odp_pool_internal.h \ include/odp_posix_extensions.h \ include/odp_queue_internal.h \ diff --git a/platform/linux-generic/queue/generic.c b/platform/linux-generic/queue/generic.c index ab2b9704..37c02380 100644 --- a/platform/linux-generic/queue/generic.c +++ b/platform/linux-generic/queue/generic.c @@ -9,7 +9,7 @@ #include <odp/api/queue.h> #include <odp_queue_internal.h> #include <odp_queue_if.h> -#include <odp_queue_subsystem.h> +#include <subsystem/spec/queue_subsystem.h> #include <odp/api/std_types.h> #include <odp/api/align.h> #include <odp/api/buffer.h> diff --git a/platform/linux-generic/queue/scalable.c b/platform/linux-generic/queue/scalable.c index 00cd8da6..f4f5efb8 100644 --- a/platform/linux-generic/queue/scalable.c +++ b/platform/linux-generic/queue/scalable.c @@ -23,7 +23,7 @@ #include <odp_packet_io_internal.h> #include <odp_pool_internal.h> #include <odp_queue_scalable_internal.h> -#include <odp_queue_subsystem.h> +#include <subsystem/spec/queue_subsystem.h> #include <odp_schedule_if.h> #include <_ishm_internal.h> #include <_ishmpool_internal.h> diff --git a/platform/linux-generic/queue/subsystem.c b/platform/linux-generic/queue/subsystem.c index 5a88b2df..b53c440f 100644 --- a/platform/linux-generic/queue/subsystem.c +++ b/platform/linux-generic/queue/subsystem.c @@ -11,7 +11,7 @@ #include <odp/api/queue.h> #include <odp_internal.h> #include <odp_debug_internal.h> -#include <odp_queue_subsystem.h> +#include <subsystem/spec/queue_subsystem.h> #include <odp_module.h> ODP_SUBSYSTEM_DEFINE(queue, "queue public APIs", QUEUE_SUBSYSTEM_VERSION); commit f47262a495ce304a924a3c5eb00eb349faeb3666 Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Thu Nov 23 15:37:33 2017 +0200 linux-gen: modular-framework: move pool subsystem header to a public folder Move pool subsystem header to a public folder. Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/include/Makefile.am b/include/Makefile.am index 0edaf31a..6bb497dc 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -70,7 +70,8 @@ odpdrvspecinclude_HEADERS = \ subsystemspecincludedir= $(includedir)/subsystem/spec subsystemspecinclude_HEADERS = \ - subsystem/spec/buffer_subsystem.h + subsystem/spec/buffer_subsystem.h \ + subsystem/spec/pool_subsystem.h odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi odpapiabidefaultinclude_HEADERS = \ diff --git a/platform/linux-generic/include/odp_pool_subsystem.h b/include/subsystem/spec/pool_subsystem.h similarity index 100% rename from platform/linux-generic/include/odp_pool_subsystem.h rename to include/subsystem/spec/pool_subsystem.h diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am index 67a46cb8..f188c377 100644 --- a/platform/linux-dpdk/Makefile.am +++ b/platform/linux-dpdk/Makefile.am @@ -209,7 +209,6 @@ noinst_HEADERS = \ ${top_srcdir}/platform/linux-generic/include/odp_packet_io_pool_access.h \ ${top_srcdir}/platform/linux-generic/include/odp_pkt_queue_internal.h \ ${srcdir}/include/odp_pool_internal.h \ - ${top_srcdir}/platform/linux-generic/include/odp_pool_subsystem.h \ ${srcdir}/include/odp_posix_extensions.h \ ${top_srcdir}/platform/linux-generic/include/odp_queue_internal.h \ ${top_srcdir}/platform/linux-generic/include/odp_queue_if.h \ diff --git a/platform/linux-dpdk/include/odp_pool_internal.h b/platform/linux-dpdk/include/odp_pool_internal.h index 2b3fc18c..7d8fba14 100644 --- a/platform/linux-dpdk/include/odp_pool_internal.h +++ b/platform/linux-dpdk/include/odp_pool_internal.h @@ -20,7 +20,7 @@ extern "C" { #include <odp/api/std_types.h> #include <odp/api/pool.h> -#include <odp_pool_subsystem.h> +#include <subsystem/spec/pool_subsystem.h> #include <odp_buffer_internal.h> #include <odp/api/packet_io.h> #include <odp/api/align.h> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index ffc6daa9..745b86ba 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -191,7 +191,6 @@ noinst_HEADERS = \ include/odp_pkt_queue_internal.h \ include/odp_queue_subsystem.h \ include/odp_pool_internal.h \ - include/odp_pool_subsystem.h \ include/odp_posix_extensions.h \ include/odp_queue_internal.h \ include/odp_queue_scalable_internal.h \ diff --git a/platform/linux-generic/include/odp_pool_internal.h b/platform/linux-generic/include/odp_pool_internal.h index 0ec12148..60687b3d 100644 --- a/platform/linux-generic/include/odp_pool_internal.h +++ b/platform/linux-generic/include/odp_pool_internal.h @@ -21,7 +21,7 @@ extern "C" { #include <odp/api/shared_memory.h> #include <odp/api/ticketlock.h> -#include <odp_pool_subsystem.h> +#include <subsystem/spec/pool_subsystem.h> #include <odp_buffer_internal.h> #include <odp_config_internal.h> #include <odp_ring_internal.h> diff --git a/platform/linux-generic/pool/subsystem.c b/platform/linux-generic/pool/subsystem.c index c5f64491..c845ce16 100644 --- a/platform/linux-generic/pool/subsystem.c +++ b/platform/linux-generic/pool/subsystem.c @@ -7,7 +7,7 @@ */ #include <odp/api/pool.h> #include <odp_internal.h> -#include <odp_pool_subsystem.h> +#include <subsystem/spec/pool_subsystem.h> #include <odp_debug_internal.h> #include <odp_module.h> commit 9126cea4346f5b715e335a54b9d72ec89533187a Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Thu Nov 23 15:16:45 2017 +0200 linux-gen: modular-framework: move buffer subsystem header to a public folder Move buffer subsystem header to a public folder. Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/include/Makefile.am b/include/Makefile.am index 37691672..0edaf31a 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -68,6 +68,10 @@ odpdrvspecinclude_HEADERS = \ odp/drv/spec/std_types.h \ odp/drv/spec/sync.h +subsystemspecincludedir= $(includedir)/subsystem/spec +subsystemspecinclude_HEADERS = \ + subsystem/spec/buffer_subsystem.h + odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi odpapiabidefaultinclude_HEADERS = \ odp/arch/default/api/abi/buffer.h \ diff --git a/platform/linux-generic/include/odp_buffer_subsystem.h b/include/subsystem/spec/buffer_subsystem.h similarity index 100% rename from platform/linux-generic/include/odp_buffer_subsystem.h rename to include/subsystem/spec/buffer_subsystem.h diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am index ee6c36e2..67a46cb8 100644 --- a/platform/linux-dpdk/Makefile.am +++ b/platform/linux-dpdk/Makefile.am @@ -175,7 +175,6 @@ odpdrvplatinclude_HEADERS = \ noinst_HEADERS = \ - ${top_srcdir}/platform/linux-generic/include/odp_buffer_subsystem.h \ ${top_srcdir}/platform/linux-generic/include/_fdserver_internal.h \ ${top_srcdir}/platform/linux-generic/include/_ishm_internal.h \ ${top_srcdir}/platform/linux-generic/include/_ishmphy_internal.h \ diff --git a/platform/linux-dpdk/buffer/dpdk.c b/platform/linux-dpdk/buffer/dpdk.c index 704468ee..22e1123b 100644 --- a/platform/linux-dpdk/buffer/dpdk.c +++ b/platform/linux-dpdk/buffer/dpdk.c @@ -9,7 +9,7 @@ #include <odp/api/buffer.h> #include <odp_buffer_internal.h> #include <odp_buffer_inlines.h> -#include <odp_buffer_subsystem.h> +#include <subsystem/spec/buffer_subsystem.h> #include <odp_debug_internal.h> #include <odp_pool_internal.h> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index a4aaa769..ffc6daa9 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -160,7 +160,6 @@ noinst_HEADERS = \ include/odp_bitmap_internal.h \ include/odp_bitset.h \ include/odp_buffer_internal.h \ - include/odp_buffer_subsystem.h \ include/odp_classification_datamodel.h \ include/odp_classification_inlines.h \ include/odp_classification_internal.h \ diff --git a/platform/linux-generic/buffer/generic.c b/platform/linux-generic/buffer/generic.c index 3281119b..cf99407c 100644 --- a/platform/linux-generic/buffer/generic.c +++ b/platform/linux-generic/buffer/generic.c @@ -11,7 +11,7 @@ #include <odp_buffer_internal.h> #include <odp_buffer_inlines.h> #include <odp_debug_internal.h> -#include <odp_buffer_subsystem.h> +#include <subsystem/spec/buffer_subsystem.h> #include <string.h> #include <stdio.h> diff --git a/platform/linux-generic/buffer/subsystem.c b/platform/linux-generic/buffer/subsystem.c index d47525cf..69ec9180 100644 --- a/platform/linux-generic/buffer/subsystem.c +++ b/platform/linux-generic/buffer/subsystem.c @@ -6,7 +6,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ #include <odp/api/buffer.h> -#include <odp_buffer_subsystem.h> +#include <subsystem/spec/buffer_subsystem.h> #include <odp_debug_internal.h> #include <odp_module.h> commit 8c1cb083f8bacd0c1fe56a759591ff7e0633be37 Author: Kevin Wang <kevin.wang(a)arm.com> Date: Wed Nov 22 15:28:20 2017 +0800 linux-gen: packet: get pool_hdl from odp_buffer_hdr_t In odp_packet_rem_data() and odp_packet_add_data(), pool_hdl is able to be gotten from odp_packet_hdr_t, don't need to get from pool_t indirectly. Signed-off-by: Kevin Wang <kevin.wang(a)arm.com> Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com> Reviewed-by: Ola Liljedahl <ola.Liljedahl(a)arm.com> Reviewed-by: Brian Brooks <brian.brooks(a)arm.com> Reviewed-by: Yi He <yi.he(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index c65d7011..853d3baa 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -1345,13 +1345,12 @@ int odp_packet_add_data(odp_packet_t *pkt_ptr, uint32_t offset, uint32_t len) odp_packet_t pkt = *pkt_ptr; odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); uint32_t pktlen = pkt_hdr->frame_len; - pool_t *pool = pkt_hdr->buf_hdr.pool_ptr; odp_packet_t newpkt; if (offset > pktlen) return -1; - newpkt = odp_packet_alloc(pool->pool_hdl, pktlen + len); + newpkt = odp_packet_alloc(pkt_hdr->buf_hdr.pool_hdl, pktlen + len); if (newpkt == ODP_PACKET_INVALID) return -1; @@ -1375,13 +1374,12 @@ int odp_packet_rem_data(odp_packet_t *pkt_ptr, uint32_t offset, uint32_t len) odp_packet_t pkt = *pkt_ptr; odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); uint32_t pktlen = pkt_hdr->frame_len; - pool_t *pool = pkt_hdr->buf_hdr.pool_ptr; odp_packet_t newpkt; if (offset > pktlen || offset + len > pktlen) return -1; - newpkt = odp_packet_alloc(pool->pool_hdl, pktlen - len); + newpkt = odp_packet_alloc(pkt_hdr->buf_hdr.pool_hdl, pktlen - len); if (newpkt == ODP_PACKET_INVALID) return -1; commit 0e8647378bfbe730101e5f089e134356dea00cda Author: Kevin Wang <kevin.wang(a)arm.com> Date: Wed Nov 22 15:21:28 2017 +0800 linux-gen: pool: rearrange pool_t to separate control and data plane Separate the pool's control plane and data plane data structures. This avoids sharing control plane related data and dataplane related data on the same cache line. Signed-off-by: Kevin Wang <kevin.wang(a)arm.com> Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com> Reviewed-by: Ola Liljedahl <ola.Liljedahl(a)arm.com> Reviewed-by: Brian Brooks <brian.brooks(a)arm.com> Reviewed-by: Yi He <yi.he(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-generic/include/odp_pool_internal.h b/platform/linux-generic/include/odp_pool_internal.h index 5004e283..0ec12148 100644 --- a/platform/linux-generic/include/odp_pool_internal.h +++ b/platform/linux-generic/include/odp_pool_internal.h @@ -54,34 +54,33 @@ typedef struct pool_t { char name[ODP_POOL_NAME_LEN]; odp_pool_param_t params; odp_pool_t pool_hdl; - uint32_t pool_idx; - uint32_t ring_mask; odp_shm_t shm; odp_shm_t uarea_shm; - int reserved; uint32_t num; uint32_t align; + uint32_t shm_size; + uint32_t uarea_shm_size; + odp_shm_t ring_shm; + /* Used by DPDK zero-copy pktio */ + pool_destroy_cb_fn ext_destroy; + void *ext_desc; + + /* Below is for data plane */ + uint8_t *base_addr ODP_ALIGNED_CACHE; + uint8_t *uarea_base_addr; + pool_ring_t *ring; uint32_t headroom; uint32_t tailroom; uint32_t seg_len; uint32_t max_len; uint32_t uarea_size; uint32_t block_size; - uint32_t shm_size; - uint32_t uarea_shm_size; - uint8_t *base_addr; - uint8_t *uarea_base_addr; - - /* Used by DPDK zero-copy pktio */ + uint32_t pool_idx; + uint32_t ring_mask; + uint8_t reserved; uint8_t mem_from_huge_pages; - pool_destroy_cb_fn ext_destroy; - void *ext_desc; pool_cache_t local_cache[ODP_THREAD_COUNT_MAX]; - - odp_shm_t ring_shm; - pool_ring_t *ring; - } pool_t; typedef struct pool_table_t { ----------------------------------------------------------------------- Summary of changes: doc/application-api-guide/Doxyfile | 1 + include/Makefile.am | 7 +++++ .../subsystem/spec/buffer_subsystem.h | 0 .../subsystem/spec/pool_subsystem.h | 0 .../subsystem/spec/queue_subsystem.h | 0 .../subsystem/spec/schedule_subsystem.h | 0 platform/linux-dpdk/Makefile.am | 4 --- platform/linux-dpdk/buffer/dpdk.c | 2 +- platform/linux-dpdk/include/odp_pool_internal.h | 2 +- platform/linux-generic/Makefile.am | 4 --- platform/linux-generic/buffer/generic.c | 2 +- platform/linux-generic/buffer/subsystem.c | 2 +- platform/linux-generic/include/odp_pool_internal.h | 31 +++++++++++----------- platform/linux-generic/odp_packet.c | 6 ++--- platform/linux-generic/pool/subsystem.c | 2 +- platform/linux-generic/queue/generic.c | 2 +- platform/linux-generic/queue/scalable.c | 2 +- platform/linux-generic/queue/subsystem.c | 2 +- platform/linux-generic/schedule/generic.c | 2 +- platform/linux-generic/schedule/iquery.c | 2 +- platform/linux-generic/schedule/scalable.c | 2 +- platform/linux-generic/schedule/sp.c | 2 +- platform/linux-generic/schedule/subsystem.c | 2 +- 23 files changed, 38 insertions(+), 41 deletions(-) rename platform/linux-generic/include/odp_buffer_subsystem.h => include/subsystem/spec/buffer_subsystem.h (100%) rename platform/linux-generic/include/odp_pool_subsystem.h => include/subsystem/spec/pool_subsystem.h (100%) rename platform/linux-generic/include/odp_queue_subsystem.h => include/subsystem/spec/queue_subsystem.h (100%) rename platform/linux-generic/include/odp_schedule_subsystem.h => include/subsystem/spec/schedule_subsystem.h (100%) hooks/post-receive --

8 years, 2 months

[COMMIT] branch api-next updated. v1.16.0.0-623-g4cb02e1c

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via 4cb02e1caccb9179575e95448fd46979e17d0905 (commit) from 90f2fe4ce26e7a2b66bb5eb13e372ccf3dec0d1c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4cb02e1caccb9179575e95448fd46979e17d0905 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Nov 22 13:58:31 2017 +0200 linux-gen: dpdk: check L3 offset validity Application is required to set L3 offset when it requests checksum offload. It caused segfault to assume that L3 offset is always set. Minimize the number of if-clauses in non-checksum path by first checking L3 offset. This fixes https://bugs.linaro.org/show_bug.cgi?id=3491 Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 5032b8df..ccccc0a8 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -567,7 +567,10 @@ static inline void pkt_set_ol_tx(odp_pktout_config_opt_t *pktout_cfg, pkt_p->output_flags.l4_chksum); if (!ipv4_chksum_pkt && !udp_chksum_pkt && !tcp_chksum_pkt) - return; + return; + + if (pkt_p->l4_offset == ODP_PACKET_OFFSET_INVALID) + return; mbuf->l2_len = pkt_p->l3_offset - pkt_p->l2_offset; mbuf->l3_len = pkt_p->l4_offset - pkt_p->l3_offset; @@ -607,8 +610,6 @@ static inline int pkt_to_mbuf(pktio_entry_t *pktio_entry, char *data; uint16_t pkt_len; odp_pktout_config_opt_t *pktout_cfg = &pktio_entry->s.config.pktout; - odp_pktout_config_opt_t *pktout_capa = - &pktio_entry->s.capa.config.pktout; if (odp_unlikely((rte_pktmbuf_alloc_bulk(pkt_dpdk->pkt_pool, mbuf_table, num)))) { @@ -616,7 +617,9 @@ static inline int pkt_to_mbuf(pktio_entry_t *pktio_entry, return 0; } for (i = 0; i < num; i++) { - pkt_len = _odp_packet_len(pkt_table[i]); + odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt_table[i]); + + pkt_len = packet_len(pkt_hdr); if (pkt_len > pkt_dpdk->mtu) { if (i == 0) @@ -629,10 +632,13 @@ static inline int pkt_to_mbuf(pktio_entry_t *pktio_entry, odp_packet_copy_to_mem(pkt_table[i], 0, pkt_len, data); - if (pktout_capa->all_bits) - pkt_set_ol_tx(pktout_cfg, pktout_capa, - odp_packet_hdr(pkt_table[i]), + if (pkt_hdr->p.l3_offset != ODP_PACKET_OFFSET_INVALID) { + odp_pktout_config_opt_t *pktout_capa = + &pktio_entry->s.capa.config.pktout; + + pkt_set_ol_tx(pktout_cfg, pktout_capa, pkt_hdr, mbuf_table[i], data); + } } return i; @@ -741,9 +747,9 @@ static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry, pkt_hdr->extra_type == PKT_EXTRA_TYPE_DPDK)) { mbuf_update(mbuf, pkt_hdr, pkt_len); - if (pktout_capa->all_bits) + if (pkt_hdr->p.l3_offset != ODP_PACKET_OFFSET_INVALID) pkt_set_ol_tx(pktout_cfg, pktout_capa, pkt_hdr, - mbuf, odp_packet_data(pkt)); + mbuf, _odp_packet_data(pkt)); } else { pool_t *pool_entry = pkt_hdr->buf_hdr.pool_ptr; @@ -764,11 +770,11 @@ static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry, mbuf_init((struct rte_mempool *) pool_entry->ext_desc, mbuf, pkt_hdr); mbuf_update(mbuf, pkt_hdr, pkt_len); - if (pktout_capa->all_bits) + if (pkt_hdr->p.l3_offset != + ODP_PACKET_OFFSET_INVALID) pkt_set_ol_tx(pktout_cfg, pktout_capa, - pkt_hdr, - mbuf, - odp_packet_data(pkt)); + pkt_hdr, mbuf, + _odp_packet_data(pkt)); } } mbuf_table[i] = mbuf; ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/pktio/dpdk.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) hooks/post-receive --

8 years, 2 months

[COMMIT] branch api-next updated. v1.16.0.0-622-g90f2fe4c

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via 90f2fe4ce26e7a2b66bb5eb13e372ccf3dec0d1c (commit) from b95e7d08043ba45d12635c5afaa3fbf3a07ecc90 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 90f2fe4ce26e7a2b66bb5eb13e372ccf3dec0d1c Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Nov 22 14:47:11 2017 +0200 example: tm: update gitignore Added missing files to gitignore file. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/traffic_mgmt/.gitignore b/example/traffic_mgmt/.gitignore index 9e742f0d..9902e702 100644 --- a/example/traffic_mgmt/.gitignore +++ b/example/traffic_mgmt/.gitignore @@ -1 +1,3 @@ -odp_traffic_mgmt \ No newline at end of file +*.log +*.trs +odp_traffic_mgmt ----------------------------------------------------------------------- Summary of changes: example/traffic_mgmt/.gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) hooks/post-receive --

8 years, 2 months

[COMMIT] branch devel/native-drivers updated. v1.15.0.0-949-g4645f4b1

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, devel/native-drivers has been updated via 4645f4b19eb5cb596fc503559f755c034f601792 (commit) via f112c9fb8487e819d064bfb03ea98429fd98ee19 (commit) via 7074b71b266de9c4eb5bf03513186a72ea27b2bc (commit) via 69b652f16d08a7d45169ce224a8a9efe03dd20e4 (commit) via 4477da1a8ef61cff56b021dc8bf28bfde40ee8ba (commit) from 4bd608048e6fa77d3154b8d90b85fc2b66c6bf1a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4645f4b19eb5cb596fc503559f755c034f601792 Author: Josep Puigdemont <josep.puigdemont(a)linaro.org> Date: Mon Nov 27 11:39:56 2017 +0100 virtio: use macros to allocate private data Signed-off-by: Josep Puigdemont <josep.puigdemont(a)linaro.org> diff --git a/platform/linux-generic/pktio/virtio.c b/platform/linux-generic/pktio/virtio.c index ddeb46f1..bb2b814c 100644 --- a/platform/linux-generic/pktio/virtio.c +++ b/platform/linux-generic/pktio/virtio.c @@ -50,6 +50,10 @@ static int virtio_open(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry, if (strncmp(devname, PCI_PKTIO_PREFIX, PCI_PKTIO_PREFIX_LEN)) return -1; + virtio_entry = ODP_OPS_DATA_ALLOC(sizeof(*virtio_entry)); + if (virtio_entry == NULL) + return -2; + pci_device = devname + PCI_PKTIO_PREFIX_LEN; ODP_PRINT("virtio_open: %s\n", pci_device); @@ -58,27 +62,39 @@ static int virtio_open(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry, if (pci_dev == NULL) { ODP_ERR("pci: could not open PCI device %s as a VirtIO device\n", pci_device); + ODP_OPS_DATA_FREE(virtio_entry); return -1; } if (virtio_pci_init(pci_dev)) { ODP_ERR("virtio: Could not open device %s\n", devname); pci_close_device(pci_dev); + ODP_OPS_DATA_FREE(virtio_entry); return -1; } - virtio_entry = odp_ops_data(pktio_entry, virtio); memset(virtio_entry, 0, sizeof(pktio_ops_virtio_data_t)); snprintf(virtio_entry->name, sizeof(virtio_entry->name), "virtio_%u", dev_id++); + virtio_entry->pci_dev = pci_dev; + + pktio_entry->s.ops_data = virtio_entry; ODP_PRINT("virtio: opened %s\n", virtio_entry->name); return 0; } -static int virtio_close(pktio_entry_t *pktio_entry ODP_UNUSED) +static int virtio_close(pktio_entry_t *pktio_entry) { + pktio_ops_virtio_data_t *virtio_entry = pktio_entry->s.ops_data; + + if (virtio_entry == NULL) + return 0; + + pci_close_device(virtio_entry->pci_dev); + ODP_OPS_DATA_FREE(virtio_entry); + return 0; } commit f112c9fb8487e819d064bfb03ea98429fd98ee19 Merge: 4bd60804 7074b71b Author: Josep Puigdemont <josep.puigdemont(a)linaro.org> Date: Mon Nov 27 11:04:17 2017 +0100 Merge remote-tracking branch 'origin/2.0' into devel/native-drivers ----------------------------------------------------------------------- Summary of changes: example/ddf_ifs/ddf_ifs_enumr_dpdk.c | 4 +- example/ddf_ifs/ddf_ifs_enumr_generic.c | 4 +- include/odp/drv/spec/driver.h | 10 ++- platform/linux-dpdk/Makefile.am | 3 + platform/linux-dpdk/pktio/dpdk.c | 57 ++++++--------- platform/linux-generic/Makefile.am | 3 + platform/linux-generic/drv_driver.c | 4 +- .../linux-generic/include/odp_packet_io_internal.h | 4 +- .../{odp/drv/hints.h => odp_packet_io_pool.h} | 19 ++--- .../include/odp_packet_io_pool_access.h | 58 +++++++++++++++ .../include/odp_pktio_ops_subsystem.h | 8 +-- platform/linux-generic/odp_packet_io.c | 9 +++ platform/linux-generic/odp_packet_io_pool.c | 55 ++++++++++++++ platform/linux-generic/pktio/dpdk.c | 75 ++++++++----------- platform/linux-generic/pktio/ipc.c | 41 +++++++---- platform/linux-generic/pktio/loopback.c | 40 +++++++---- platform/linux-generic/pktio/netmap.c | 83 ++++++++++------------ platform/linux-generic/pktio/pcap.c | 26 ++++--- platform/linux-generic/pktio/socket.c | 58 +++++++-------- platform/linux-generic/pktio/socket_mmap.c | 58 +++++++-------- platform/linux-generic/pktio/tap.c | 46 +++++++----- platform/linux-generic/pktio/virtio.c | 20 +++++- test/validation/drv/drvdriver/drvdriver_device.c | 11 +-- test/validation/drv/drvdriver/drvdriver_driver.c | 18 ++--- test/validation/drv/drvdriver/drvdriver_enumr.c | 52 ++++++++------ 25 files changed, 469 insertions(+), 297 deletions(-) copy platform/linux-generic/include/{odp/drv/hints.h => odp_packet_io_pool.h} (51%) create mode 100644 platform/linux-generic/include/odp_packet_io_pool_access.h create mode 100644 platform/linux-generic/odp_packet_io_pool.c hooks/post-receive --

8 years, 2 months

[COMMIT] branch 2.0 updated. v1.15.0.0-932-g7074b71b

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, 2.0 has been updated via 7074b71b266de9c4eb5bf03513186a72ea27b2bc (commit) via 69b652f16d08a7d45169ce224a8a9efe03dd20e4 (commit) via 4477da1a8ef61cff56b021dc8bf28bfde40ee8ba (commit) from 6cd43041e55bd73a02ca202f835e590b3ad5c354 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7074b71b266de9c4eb5bf03513186a72ea27b2bc Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Mon Nov 20 14:33:19 2017 +0200 linux-gen: pktio: use pktio operations data pool Pktio instances need a memory area where to store configuration or state information. This patch replaces utilization of a fixed size memory area with a variable size memory area allocated from a predefined pool. This reduces the memory size needed to store pktio array. Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com> Reviewed-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-dpdk/pktio/dpdk.c b/platform/linux-dpdk/pktio/dpdk.c index a6e2573e..832ac7ac 100644 --- a/platform/linux-dpdk/pktio/dpdk.c +++ b/platform/linux-dpdk/pktio/dpdk.c @@ -99,8 +99,7 @@ static void _dpdk_print_port_mac(uint8_t portid) static int input_queues_config_pkt_dpdk(pktio_entry_t *pktio_entry, const odp_pktin_queue_param_t *p) { - pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; odp_pktin_mode_t mode = pktio_entry->s.param.in_mode; /** @@ -129,8 +128,7 @@ static int input_queues_config_pkt_dpdk(pktio_entry_t *pktio_entry, static int output_queues_config_pkt_dpdk(pktio_entry_t *pktio_entry, const odp_pktout_queue_param_t *p) { - pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; if (p->op_mode == ODP_PKTIO_OP_MT_UNSAFE) pkt_dpdk->lockless_tx = 1; @@ -147,8 +145,7 @@ static int setup_pkt_dpdk(odp_pktio_t pktio ODP_UNUSED, { uint8_t portid = 0; struct rte_eth_dev_info dev_info; - pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + pktio_ops_dpdk_data_t *pkt_dpdk = NULL; int i; if (!_dpdk_netdev_is_valid(netdev)) { @@ -157,10 +154,14 @@ static int setup_pkt_dpdk(odp_pktio_t pktio ODP_UNUSED, return -1; } - if (odp_unlikely(pkt_dpdk == NULL)) { + pktio_entry->s.ops_data = ODP_OPS_DATA_ALLOC(sizeof(*pkt_dpdk)); + if (odp_unlikely(pktio_entry->s.ops_data == NULL)) { ODP_ERR("Failed to allocate pktio_ops_dpdk_data_t struct"); return -1; } + pkt_dpdk = pktio_entry->s.ops_data; + + memset(pkt_dpdk, 0, sizeof(*pkt_dpdk)); portid = atoi(netdev); pkt_dpdk->portid = portid; @@ -168,6 +169,7 @@ static int setup_pkt_dpdk(odp_pktio_t pktio ODP_UNUSED, rte_eth_dev_info_get(portid, &dev_info); if (dev_info.driver_name == NULL) { ODP_DBG("No driver found for interface: %s\n", netdev); + ODP_OPS_DATA_FREE(pktio_entry->s.ops_data); return -1; } if (!strcmp(dev_info.driver_name, "rte_ixgbe_pmd")) @@ -191,20 +193,18 @@ static int setup_pkt_dpdk(odp_pktio_t pktio ODP_UNUSED, static int close_pkt_dpdk(pktio_entry_t *pktio_entry) { - const pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + const pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; if (pktio_entry->s.state == PKTIO_STATE_STOPPED) rte_eth_dev_close(pkt_dpdk->portid); - return 0; + return ODP_OPS_DATA_FREE(pktio_entry->s.ops_data); } static int start_pkt_dpdk(pktio_entry_t *pktio_entry) { int ret, i; - pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; uint8_t portid = pkt_dpdk->portid; int sid = rte_eth_dev_socket_id(pkt_dpdk->portid); int socket_id = sid < 0 ? 0 : sid; @@ -312,8 +312,7 @@ static int start_pkt_dpdk(pktio_entry_t *pktio_entry) static int stop_pkt_dpdk(pktio_entry_t *pktio_entry) { - pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; rte_eth_dev_stop(pkt_dpdk->portid); return 0; @@ -362,8 +361,7 @@ static int recv_pkt_dpdk(pktio_entry_t *pktio_entry, int index, odp_packet_t pkt_table[], int len) { uint16_t nb_rx, i; - pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; odp_packet_t *saved_pkt_table; uint8_t min = pkt_dpdk->min_rx_burst; odp_time_t ts_val; @@ -479,8 +477,7 @@ static int send_pkt_dpdk(pktio_entry_t *pktio_entry, int index, const odp_packet_t pkt_table[], int len) { int pkts; - pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; if (!pkt_dpdk->lockless_tx) odp_ticketlock_lock(&pkt_dpdk->tx_lock[index]); @@ -532,8 +529,7 @@ static uint32_t _dpdk_vdev_mtu(uint8_t port_id) static uint32_t mtu_get_pkt_dpdk(pktio_entry_t *pktio_entry) { - pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; uint16_t mtu = 0; int ret; @@ -593,8 +589,7 @@ static int _dpdk_vdev_promisc_mode_set(uint8_t port_id, int enable) static int promisc_mode_set_pkt_dpdk(pktio_entry_t *pktio_entry, int enable) { - const pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + const pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; uint8_t portid = pkt_dpdk->portid; if (enable) @@ -637,8 +632,7 @@ static int _dpdk_vdev_promisc_mode(uint8_t port_id) static int promisc_mode_get_pkt_dpdk(pktio_entry_t *pktio_entry) { - const pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + const pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; uint8_t portid = pkt_dpdk->portid; if (pkt_dpdk->vdev_sysc_promisc) @@ -649,8 +643,7 @@ static int promisc_mode_get_pkt_dpdk(pktio_entry_t *pktio_entry) static int mac_get_pkt_dpdk(pktio_entry_t *pktio_entry, void *mac_addr) { - const pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + const pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; rte_eth_macaddr_get(pkt_dpdk->portid, (struct ether_addr *)mac_addr); @@ -660,8 +653,7 @@ static int mac_get_pkt_dpdk(pktio_entry_t *pktio_entry, void *mac_addr) static int capability_pkt_dpdk(pktio_entry_t *pktio_entry, odp_pktio_capability_t *capa) { - const pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + const pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; *capa = pkt_dpdk->capa; return 0; @@ -669,8 +661,7 @@ static int capability_pkt_dpdk(pktio_entry_t *pktio_entry, static int link_status_pkt_dpdk(pktio_entry_t *pktio_entry) { - const pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + const pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; struct rte_eth_link link; rte_eth_link_get(pkt_dpdk->portid, &link); @@ -693,8 +684,7 @@ static void stats_convert(struct rte_eth_stats *rte_stats, static int stats_pkt_dpdk(pktio_entry_t *pktio_entry, odp_pktio_stats_t *stats) { - const pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + const pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; int ret; struct rte_eth_stats rte_stats; @@ -712,8 +702,7 @@ static int stats_pkt_dpdk(pktio_entry_t *pktio_entry, odp_pktio_stats_t *stats) static int stats_reset_pkt_dpdk(pktio_entry_t *pktio_entry) { - const pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + const pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; rte_eth_stats_reset(pkt_dpdk->portid); return 0; diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index 7df11618..6912b851 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -43,8 +43,8 @@ typedef union pktio_entry_u pktio_entry_t; struct pktio_entry { const pktio_ops_module_t *ops; /**< Implementation specific methods */ - uint8_t ops_data[ODP_PKTIO_ODPS_DATA_MAX_SIZE]; /**< IO operation - specific data */ + void *ops_data; /**< IO operation specific data */ + /* These two locks together lock the whole pktio device */ odp_ticketlock_t rxl; /**< RX ticketlock */ odp_ticketlock_t txl; /**< TX ticketlock */ diff --git a/platform/linux-generic/include/odp_pktio_ops_subsystem.h b/platform/linux-generic/include/odp_pktio_ops_subsystem.h index cb107fed..f93011e9 100644 --- a/platform/linux-generic/include/odp_pktio_ops_subsystem.h +++ b/platform/linux-generic/include/odp_pktio_ops_subsystem.h @@ -16,6 +16,7 @@ extern "C" { #include <odp_module.h> #include <odp/api/packet_io.h> +#include <odp_packet_io_pool_access.h> /* ODP packet IO operations subsystem declaration */ ODP_SUBSYSTEM_DECLARE(pktio_ops); @@ -85,13 +86,6 @@ typedef ODP_MODULE_CLASS(pktio_ops) { odp_api_proto(pktio_ops, print) print; } pktio_ops_module_t; -/* Maximum size of pktio specific ops data.*/ -#define ODP_PKTIO_ODPS_DATA_MAX_SIZE 80000 - -/* Extract pktio ops data from pktio entry structure */ -#define odp_ops_data(_p, _mod) \ - ((pktio_ops_ ## _mod ## _data_t *)(uintptr_t)_p->s.ops_data) - #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 4ef111c3..7d39bb1b 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -382,7 +382,7 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, struct rte_mbuf *mbuf_table[], uint16_t mbuf_num, odp_time_t *ts) { - pktio_ops_dpdk_data_t *pkt_dpdk = odp_ops_data(pktio_entry, dpdk); + pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; odp_packet_t pkt; odp_packet_hdr_t *pkt_hdr; uint16_t pkt_len; @@ -564,8 +564,7 @@ static inline int pkt_to_mbuf(pktio_entry_t *pktio_entry, struct rte_mbuf *mbuf_table[], const odp_packet_t pkt_table[], uint16_t num) { - pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; int i, j; char *data; uint16_t pkt_len; @@ -609,8 +608,7 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry, struct rte_mbuf *mbuf_table[], uint16_t mbuf_num, odp_time_t *ts) { - pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; odp_packet_t pkt; odp_packet_hdr_t *pkt_hdr; uint16_t pkt_len; @@ -683,8 +681,7 @@ static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry, const odp_packet_t pkt_table[], uint16_t num, uint16_t *copy_count) { - pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; odp_pktout_config_opt_t *pktout_cfg = &pktio_entry->s.config.pktout; int i; *copy_count = 0; @@ -778,8 +775,7 @@ static uint32_t dpdk_vdev_mtu_get(uint8_t port_id) static uint32_t dpdk_mtu_get(pktio_entry_t *pktio_entry) { - pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; uint32_t mtu = 0; if (rte_eth_dev_get_mtu(pkt_dpdk->port_id, (uint16_t *)&mtu)) @@ -872,8 +868,7 @@ static void rss_conf_to_hash_proto(struct rte_eth_rss_conf *rss_conf, static int dpdk_setup_port(pktio_entry_t *pktio_entry) { int ret; - pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; struct rte_eth_rss_conf rss_conf; uint16_t hw_ip_checksum = 0; @@ -921,8 +916,7 @@ static int dpdk_setup_port(pktio_entry_t *pktio_entry) static int dpdk_close(pktio_entry_t *pktio_entry) { - pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; unsigned idx; unsigned i, j; @@ -934,7 +928,7 @@ static int dpdk_close(pktio_entry_t *pktio_entry) rte_pktmbuf_free(pkt_dpdk->rx_cache[i].s.pkt[idx++]); } - return 0; + return ODP_OPS_DATA_FREE(pktio_entry->s.ops_data); } static int dpdk_pktio_init(void) @@ -1088,8 +1082,7 @@ static int dpdk_pktio_term(void) static int dpdk_input_queues_config(pktio_entry_t *pktio_entry, const odp_pktin_queue_param_t *p) { - pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; odp_pktin_mode_t mode = pktio_entry->s.param.in_mode; odp_bool_t lockless; @@ -1113,8 +1106,7 @@ static int dpdk_input_queues_config(pktio_entry_t *pktio_entry, static int dpdk_output_queues_config(pktio_entry_t *pktio_entry, const odp_pktout_queue_param_t *p) { - pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; odp_bool_t lockless; if (p->op_mode == ODP_PKTIO_OP_MT_UNSAFE) @@ -1130,8 +1122,7 @@ static int dpdk_output_queues_config(pktio_entry_t *pktio_entry, static void dpdk_init_capability(pktio_entry_t *pktio_entry, struct rte_eth_dev_info *dev_info) { - pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; odp_pktio_capability_t *capa = &pkt_dpdk->capa; int ptype_cnt; int ptype_l3_ipv4 = 0; @@ -1208,8 +1199,7 @@ static int dpdk_open(odp_pktio_t id ODP_UNUSED, const char *netdev, odp_pool_t pool) { - pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + pktio_ops_dpdk_data_t *pkt_dpdk = NULL; struct rte_eth_dev_info dev_info; struct rte_mempool *pkt_pool; char pool_name[RTE_MEMPOOL_NAMESIZE]; @@ -1223,6 +1213,7 @@ static int dpdk_open(odp_pktio_t id ODP_UNUSED, if (pool == ODP_POOL_INVALID) return -1; + pool_entry = pool_entry_from_hdl(pool); if (!dpdk_netdev_is_valid(netdev)) { @@ -1237,10 +1228,12 @@ static int dpdk_open(odp_pktio_t id ODP_UNUSED, dpdk_initialized = 1; } - if (odp_unlikely(pkt_dpdk == NULL)) { + pktio_entry->s.ops_data = ODP_OPS_DATA_ALLOC(sizeof(*pkt_dpdk)); + if (odp_unlikely(pktio_entry->s.ops_data == NULL)) { ODP_ERR("Failed to allocate pktio_ops_dpdk_data_t struct"); return -1; } + pkt_dpdk = pktio_entry->s.ops_data; /* Init pktio entry */ memset(pkt_dpdk, 0, sizeof(*pkt_dpdk)); @@ -1250,6 +1243,7 @@ static int dpdk_open(odp_pktio_t id ODP_UNUSED, if (rte_eth_dev_count() == 0) { ODP_ERR("No DPDK ports found\n"); + ODP_OPS_DATA_FREE(pktio_entry->s.ops_data); return -1; } @@ -1258,6 +1252,7 @@ static int dpdk_open(odp_pktio_t id ODP_UNUSED, mtu = dpdk_mtu_get(pktio_entry); if (mtu == 0) { ODP_ERR("Failed to read interface MTU\n"); + ODP_OPS_DATA_FREE(pktio_entry->s.ops_data); return -1; } pkt_dpdk->mtu = mtu + _ODP_ETHHDR_LEN; @@ -1294,6 +1289,7 @@ static int dpdk_open(odp_pktio_t id ODP_UNUSED, } if (pkt_pool == NULL) { ODP_ERR("Cannot init mbuf packet pool\n"); + ODP_OPS_DATA_FREE(pktio_entry->s.ops_data); return -1; } @@ -1318,8 +1314,7 @@ static int dpdk_open(odp_pktio_t id ODP_UNUSED, static int dpdk_start(pktio_entry_t *pktio_entry) { - pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; uint8_t port_id = pkt_dpdk->port_id; int ret; unsigned i; @@ -1370,8 +1365,7 @@ static int dpdk_start(pktio_entry_t *pktio_entry) static int dpdk_stop(pktio_entry_t *pktio_entry) { - pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; rte_eth_dev_stop(pkt_dpdk->port_id); @@ -1381,8 +1375,7 @@ static int dpdk_stop(pktio_entry_t *pktio_entry) static int dpdk_recv(pktio_entry_t *pktio_entry, int index, odp_packet_t pkt_table[], int num) { - pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; pkt_cache_t *rx_cache = &pkt_dpdk->rx_cache[index]; odp_time_t ts_val; odp_time_t *ts = NULL; @@ -1457,8 +1450,7 @@ static int dpdk_send(pktio_entry_t *pktio_entry, int index, const odp_packet_t pkt_table[], int num) { struct rte_mbuf *tx_mbufs[num]; - pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; uint16_t copy_count = 0; int tx_pkts; int i; @@ -1521,8 +1513,7 @@ static int dpdk_send(pktio_entry_t *pktio_entry, int index, static int dpdk_mac_addr_get(pktio_entry_t *pktio_entry, void *mac_addr) { - pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; rte_eth_macaddr_get(pkt_dpdk->port_id, (struct ether_addr *)mac_addr); @@ -1531,8 +1522,7 @@ static int dpdk_mac_addr_get(pktio_entry_t *pktio_entry, void *mac_addr) static int dpdk_promisc_mode_set(pktio_entry_t *pktio_entry, odp_bool_t enable) { - pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; uint8_t port_id = pkt_dpdk->port_id; if (pkt_dpdk->vdev_sysc_promisc) @@ -1548,8 +1538,7 @@ static int dpdk_promisc_mode_set(pktio_entry_t *pktio_entry, odp_bool_t enable) static int dpdk_promisc_mode_get(pktio_entry_t *pktio_entry) { - pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; uint8_t port_id = pkt_dpdk->port_id; if (pkt_dpdk->vdev_sysc_promisc) @@ -1561,8 +1550,7 @@ static int dpdk_promisc_mode_get(pktio_entry_t *pktio_entry) static int dpdk_capability(pktio_entry_t *pktio_entry, odp_pktio_capability_t *capa) { - pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; *capa = pkt_dpdk->capa; return 0; @@ -1570,8 +1558,7 @@ static int dpdk_capability(pktio_entry_t *pktio_entry, static int dpdk_link_status(pktio_entry_t *pktio_entry) { - pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; struct rte_eth_link link; memset(&link, 0, sizeof(struct rte_eth_link)); @@ -1595,8 +1582,7 @@ static void stats_convert(const struct rte_eth_stats *rte_stats, static int dpdk_stats(pktio_entry_t *pktio_entry, odp_pktio_stats_t *stats) { - pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; int ret; struct rte_eth_stats rte_stats; @@ -1611,8 +1597,7 @@ static int dpdk_stats(pktio_entry_t *pktio_entry, odp_pktio_stats_t *stats) static int dpdk_stats_reset(pktio_entry_t *pktio_entry) { - pktio_ops_dpdk_data_t *pkt_dpdk = - odp_ops_data(pktio_entry, dpdk); + pktio_ops_dpdk_data_t *pkt_dpdk = pktio_entry->s.ops_data; rte_eth_stats_reset(pkt_dpdk->port_id); return 0; diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index 5ab95740..9d928c72 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -49,7 +49,7 @@ static const char *_ipc_odp_buffer_pool_shm_name(odp_pool_t pool_hdl) static int _ipc_master_start(pktio_entry_t *pktio_entry) { - pktio_ops_ipc_data_t *pkt_ipc = odp_ops_data(pktio_entry, ipc); + pktio_ops_ipc_data_t *pkt_ipc = pktio_entry->s.ops_data; struct pktio_info *pinfo = pkt_ipc->pinfo; odp_shm_t shm; @@ -78,7 +78,7 @@ static int _ipc_init_master(pktio_entry_t *pktio_entry, const char *dev, odp_pool_t pool_hdl) { - pktio_ops_ipc_data_t *pkt_ipc = odp_ops_data(pktio_entry, ipc); + pktio_ops_ipc_data_t *pkt_ipc = pktio_entry->s.ops_data; char ipc_shm_name[ODP_POOL_NAME_LEN + sizeof("_m_prod")]; pool_t *pool; struct pktio_info *pinfo; @@ -230,7 +230,7 @@ static int _ipc_init_slave(const char *dev, pktio_entry_t *pktio_entry, odp_pool_t pool) { - pktio_ops_ipc_data_t *pkt_ipc = odp_ops_data(pktio_entry, ipc); + pktio_ops_ipc_data_t *pkt_ipc = pktio_entry->s.ops_data; if (strlen(dev) > (ODP_POOL_NAME_LEN - sizeof("_slave_r"))) ODP_ABORT("too big ipc name\n"); @@ -241,7 +241,7 @@ static int _ipc_init_slave(const char *dev, static int _ipc_slave_start(pktio_entry_t *pktio_entry) { - pktio_ops_ipc_data_t *pkt_ipc = odp_ops_data(pktio_entry, ipc); + pktio_ops_ipc_data_t *pkt_ipc = pktio_entry->s.ops_data; char ipc_shm_name[ODP_POOL_NAME_LEN + sizeof("_slave_r")]; struct pktio_info *pinfo; odp_shm_t shm; @@ -343,7 +343,7 @@ static int ipc_pktio_open(odp_pktio_t id ODP_UNUSED, char name[ODP_POOL_NAME_LEN + sizeof("_info")]; char tail[ODP_POOL_NAME_LEN]; odp_shm_t shm; - pktio_ops_ipc_data_t *pkt_ipc = odp_ops_data(pktio_entry, ipc); + pktio_ops_ipc_data_t *pkt_ipc; ODP_STATIC_ASSERT(ODP_POOL_NAME_LEN == _RING_NAMESIZE, "mismatch pool and ring name arrays"); @@ -351,6 +351,15 @@ static int ipc_pktio_open(odp_pktio_t id ODP_UNUSED, if (strncmp(dev, "ipc", 3)) return -1; + pktio_entry->s.ops_data = ODP_OPS_DATA_ALLOC(sizeof(*pkt_ipc)); + if (odp_unlikely(pktio_entry->s.ops_data == NULL)) { + ODP_ERR("Failed to allocate pktio_ops_ipc_data_t struct"); + return -1; + } + + pkt_ipc = pktio_entry->s.ops_data; + memset(pkt_ipc, 0, sizeof(*pkt_ipc)); + odp_atomic_init_u32(&pkt_ipc->ready, 0); pkt_ipc->rx.cache = _ring_create("ipc_rx_cache", @@ -364,12 +373,15 @@ static int ipc_pktio_open(odp_pktio_t id ODP_UNUSED, snprintf(name, sizeof(name), "ipc:%s_info", tail); IPC_ODP_DBG("lookup for name %s for pid %d\n", name, pid); shm = odp_shm_import(name, pid, name); - if (ODP_SHM_INVALID == shm) + if (ODP_SHM_INVALID == shm) { + ODP_OPS_DATA_FREE(pktio_entry->s.ops_data); return -1; + } pinfo = odp_shm_addr(shm); if (!pinfo->master.init_done) { odp_shm_free(shm); + ODP_OPS_DATA_FREE(pktio_entry->s.ops_data); return -1; } pkt_ipc->pinfo = pinfo; @@ -384,6 +396,7 @@ static int ipc_pktio_open(odp_pktio_t id ODP_UNUSED, _ODP_ISHM_EXPORT | _ODP_ISHM_LOCK); if (ODP_SHM_INVALID == shm) { ODP_ERR("can not create shm %s\n", name); + ODP_OPS_DATA_FREE(pktio_entry->s.ops_data); return -1; } @@ -396,12 +409,14 @@ static int ipc_pktio_open(odp_pktio_t id ODP_UNUSED, ret = _ipc_init_master(pktio_entry, dev, pool); } + if (ret) + ODP_OPS_DATA_FREE(pktio_entry->s.ops_data); return ret; } static void _ipc_free_ring_packets(pktio_entry_t *pktio_entry, _ring_t *r) { - pktio_ops_ipc_data_t *pkt_ipc = odp_ops_data(pktio_entry, ipc); + pktio_ops_ipc_data_t *pkt_ipc = pktio_entry->s.ops_data; uintptr_t offsets[PKTIO_IPC_ENTRIES]; int ret; void **rbuf_p; @@ -437,7 +452,7 @@ static void _ipc_free_ring_packets(pktio_entry_t *pktio_entry, _ring_t *r) static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry, odp_packet_t pkt_table[], int len) { - pktio_ops_ipc_data_t *pkt_ipc = odp_ops_data(pktio_entry, ipc); + pktio_ops_ipc_data_t *pkt_ipc = pktio_entry->s.ops_data; int pkts = 0; int i; _ring_t *r; @@ -590,7 +605,7 @@ static int ipc_pktio_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry, const odp_packet_t pkt_table[], int len) { - pktio_ops_ipc_data_t *pkt_ipc = odp_ops_data(pktio_entry, ipc); + pktio_ops_ipc_data_t *pkt_ipc = pktio_entry->s.ops_data; _ring_t *r; void **rbuf_p; int ret; @@ -703,7 +718,7 @@ static int ipc_mac_addr_get(pktio_entry_t *pktio_entry ODP_UNUSED, static int ipc_start(pktio_entry_t *pktio_entry) { - pktio_ops_ipc_data_t *pkt_ipc = odp_ops_data(pktio_entry, ipc); + pktio_ops_ipc_data_t *pkt_ipc = pktio_entry->s.ops_data; uint32_t ready = odp_atomic_load_u32(&pkt_ipc->ready); if (ready) { @@ -719,7 +734,7 @@ static int ipc_start(pktio_entry_t *pktio_entry) static int ipc_stop(pktio_entry_t *pktio_entry) { - pktio_ops_ipc_data_t *pkt_ipc = odp_ops_data(pktio_entry, ipc); + pktio_ops_ipc_data_t *pkt_ipc = pktio_entry->s.ops_data; unsigned tx_send = 0, tx_free = 0; odp_atomic_store_u32(&pkt_ipc->ready, 0); @@ -746,7 +761,7 @@ static int ipc_stop(pktio_entry_t *pktio_entry) static int ipc_close(pktio_entry_t *pktio_entry) { - pktio_ops_ipc_data_t *pkt_ipc = odp_ops_data(pktio_entry, ipc); + pktio_ops_ipc_data_t *pkt_ipc = pktio_entry->s.ops_data; char ipc_shm_name[ODP_POOL_NAME_LEN + sizeof("_m_prod")]; char *dev = pktio_entry->s.name; char name[ODP_POOL_NAME_LEN]; @@ -776,7 +791,7 @@ static int ipc_close(pktio_entry_t *pktio_entry) _ring_destroy(ipc_shm_name); _ring_destroy("ipc_rx_cache"); - return 0; + return ODP_OPS_DATA_FREE(pktio_entry->s.ops_data); } static int ipc_pktio_init_global(void) diff --git a/platform/linux-generic/pktio/loopback.c b/platform/linux-generic/pktio/loopback.c index 60bee591..ff08364a 100644 --- a/platform/linux-generic/pktio/loopback.c +++ b/platform/linux-generic/pktio/loopback.c @@ -32,20 +32,30 @@ static int loopback_stats_reset(pktio_entry_t *pktio_entry); static int loopback_open(odp_pktio_t id, pktio_entry_t *pktio_entry, const char *devname, odp_pool_t pool ODP_UNUSED) { - pktio_ops_loopback_data_t *pkt_lbk = - odp_ops_data(pktio_entry, loopback); + pktio_ops_loopback_data_t *pkt_lbk = NULL; if (strcmp(devname, "loop")) return -1; + pktio_entry->s.ops_data = ODP_OPS_DATA_ALLOC(sizeof(*pkt_lbk)); + if (odp_unlikely(pktio_entry->s.ops_data == NULL)) { + ODP_ERR("Failed to allocate pktio_ops_loopback_data_t struct"); + return -1; + } + + pkt_lbk = pktio_entry->s.ops_data; + memset(pkt_lbk, 0, sizeof(*pkt_lbk)); + char loopq_name[ODP_QUEUE_NAME_LEN]; snprintf(loopq_name, sizeof(loopq_name), "%" PRIu64 "-pktio_loopq", odp_pktio_to_u64(id)); pkt_lbk->loopq = odp_queue_create(loopq_name, NULL); - if (pkt_lbk->loopq == ODP_QUEUE_INVALID) + if (pkt_lbk->loopq == ODP_QUEUE_INVALID) { + ODP_OPS_DATA_FREE(pktio_entry->s.ops_data); return -1; + } loopback_stats_reset(pktio_entry); @@ -54,10 +64,16 @@ static int loopback_open(odp_pktio_t id, pktio_entry_t *pktio_entry, static int loopback_close(pktio_entry_t *pktio_entry) { - pktio_ops_loopback_data_t *pkt_lbk = - odp_ops_data(pktio_entry, loopback); + int result = 0; + pktio_ops_loopback_data_t *pkt_lbk = pktio_entry->s.ops_data; + + if (odp_queue_destroy(pkt_lbk->loopq)) + result = -1; + + if (ODP_OPS_DATA_FREE(pktio_entry->s.ops_data)) + result = -1; - return odp_queue_destroy(pkt_lbk->loopq); + return result; } static int loopback_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, @@ -72,8 +88,7 @@ static int loopback_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, odp_time_t *ts = NULL; int num_rx = 0; int failed = 0; - pktio_ops_loopback_data_t *pkt_lbk = - odp_ops_data(pktio_entry, loopback); + pktio_ops_loopback_data_t *pkt_lbk = pktio_entry->s.ops_data; if (odp_unlikely(len > QUEUE_MULTI_MAX)) len = QUEUE_MULTI_MAX; @@ -170,8 +185,7 @@ static int loopback_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, int i; int ret; uint32_t bytes = 0; - pktio_ops_loopback_data_t *pkt_lbk = - odp_ops_data(pktio_entry, loopback); + pktio_ops_loopback_data_t *pkt_lbk = pktio_entry->s.ops_data; if (odp_unlikely(len > QUEUE_MULTI_MAX)) len = QUEUE_MULTI_MAX; @@ -255,8 +269,7 @@ static int loopback_capability(pktio_entry_t *pktio_entry ODP_UNUSED, static int loopback_promisc_mode_set(pktio_entry_t *pktio_entry, odp_bool_t enable) { - pktio_ops_loopback_data_t *pkt_lbk = - odp_ops_data(pktio_entry, loopback); + pktio_ops_loopback_data_t *pkt_lbk = pktio_entry->s.ops_data; pkt_lbk->promisc = enable; return 0; @@ -264,8 +277,7 @@ static int loopback_promisc_mode_set(pktio_entry_t *pktio_entry, static int loopback_promisc_mode_get(pktio_entry_t *pktio_entry) { - pktio_ops_loopback_data_t *pkt_lbk = - odp_ops_data(pktio_entry, loopback); + pktio_ops_loopback_data_t *pkt_lbk = pktio_entry->s.ops_data; return pkt_lbk->promisc ? 1 : 0; } diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 29c449e4..2631c816 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -50,8 +50,7 @@ static int netmap_stats_reset(pktio_entry_t *pktio_entry); static int netmap_do_ioctl(pktio_entry_t *pktio_entry, unsigned long cmd, int subcmd) { - pktio_ops_netmap_data_t *pkt_nm = - odp_ops_data(pktio_entry, netmap); + pktio_ops_netmap_data_t *pkt_nm = pktio_entry->s.ops_data; struct ethtool_value eval; struct ifreq ifr; int err; @@ -138,8 +137,7 @@ static inline void map_netmap_rings(netmap_ring_t *rings, static int netmap_input_queues_config(pktio_entry_t *pktio_entry, const odp_pktin_queue_param_t *p) { - pktio_ops_netmap_data_t *pkt_nm = - odp_ops_data(pktio_entry, netmap); + pktio_ops_netmap_data_t *pkt_nm = pktio_entry->s.ops_data; odp_pktin_mode_t mode = pktio_entry->s.param.in_mode; unsigned num_queues = p->num_queues; odp_bool_t lockless; @@ -167,8 +165,7 @@ static int netmap_input_queues_config(pktio_entry_t *pktio_entry, static int netmap_output_queues_config(pktio_entry_t *pktio_entry, const odp_pktout_queue_param_t *p) { - pktio_ops_netmap_data_t *pkt_nm = - odp_ops_data(pktio_entry, netmap); + pktio_ops_netmap_data_t *pkt_nm = pktio_entry->s.ops_data; pkt_nm->lockless_tx = (p->op_mode == ODP_PKTIO_OP_MT_UNSAFE); @@ -185,8 +182,7 @@ static int netmap_output_queues_config(pktio_entry_t *pktio_entry, static inline void netmap_close_descriptors(pktio_entry_t *pktio_entry) { int i, j; - pktio_ops_netmap_data_t *pkt_nm = - odp_ops_data(pktio_entry, netmap); + pktio_ops_netmap_data_t *pkt_nm = pktio_entry->s.ops_data; for (i = 0; i < PKTIO_MAX_QUEUES; i++) { for (j = 0; j < NM_MAX_DESC; j++) { @@ -209,23 +205,30 @@ static inline void netmap_close_descriptors(pktio_entry_t *pktio_entry) static int netmap_close(pktio_entry_t *pktio_entry) { - pktio_ops_netmap_data_t *pkt_nm = - odp_ops_data(pktio_entry, netmap); + int status = 0; + pktio_ops_netmap_data_t *pkt_nm = pktio_entry->s.ops_data; netmap_close_descriptors(pktio_entry); if (pkt_nm->sockfd != -1 && close(pkt_nm->sockfd) != 0) { __odp_errno = errno; ODP_ERR("close(sockfd): %s\n", strerror(errno)); - return -1; + + status = -1; } - return 0; + + if (ODP_OPS_DATA_FREE(pktio_entry->s.ops_data)) { + ODP_ERR("ops_data_free(netmap) failed\n"); + + status = -1; + } + + return status; } static int netmap_link_status(pktio_entry_t *pktio_entry) { - pktio_ops_netmap_data_t *pkt_nm = - odp_ops_data(pktio_entry, netmap); + pktio_ops_netmap_data_t *pkt_nm = pktio_entry->s.ops_data; if (pkt_nm->is_virtual) return 1; @@ -246,8 +249,7 @@ static inline int netmap_wait_for_link(pktio_entry_t *pktio_entry) { int i; int ret; - pktio_ops_netmap_data_t *pkt_nm = - odp_ops_data(pktio_entry, netmap); + pktio_ops_netmap_data_t *pkt_nm = pktio_entry->s.ops_data; /* Wait for the link to come up */ for (i = 0; i <= NM_WAIT_TIMEOUT; i++) { @@ -275,8 +277,7 @@ static inline int netmap_wait_for_link(pktio_entry_t *pktio_entry) */ static void netmap_init_capability(pktio_entry_t *pktio_entry) { - pktio_ops_netmap_data_t *pkt_nm = - odp_ops_data(pktio_entry, netmap); + pktio_ops_netmap_data_t *pkt_nm = pktio_entry->s.ops_data; odp_pktio_capability_t *capa = &pkt_nm->capa; memset(&pkt_nm->capa, 0, sizeof(odp_pktio_capability_t)); @@ -343,8 +344,7 @@ static int netmap_open(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry, const char *prefix; uint32_t mtu; uint32_t buf_size; - pktio_ops_netmap_data_t *pkt_nm = - odp_ops_data(pktio_entry, netmap); + pktio_ops_netmap_data_t *pkt_nm = NULL; struct nm_desc *desc; struct netmap_ring *ring; odp_pktin_hash_proto_t hash_proto; @@ -356,6 +356,13 @@ static int netmap_open(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry, if (pool == ODP_POOL_INVALID) return -1; + pktio_entry->s.ops_data = ODP_OPS_DATA_ALLOC(sizeof(*pkt_nm)); + if (odp_unlikely(pktio_entry->s.ops_data == NULL)) { + ODP_ERR("Failed to allocate pktio_ops_netmap_data_t struct"); + return -1; + } + pkt_nm = pktio_entry->s.ops_data; + /* Init pktio entry */ memset(pkt_nm, 0, sizeof(*pkt_nm)); pkt_nm->sockfd = -1; @@ -476,8 +483,7 @@ error: static int netmap_start(pktio_entry_t *pktio_entry) { - pktio_ops_netmap_data_t *pkt_nm = - odp_ops_data(pktio_entry, netmap); + pktio_ops_netmap_data_t *pkt_nm = pktio_entry->s.ops_data; netmap_ring_t *desc_ring; struct nm_desc *desc_ptr; unsigned i; @@ -633,8 +639,7 @@ static inline int netmap_pkt_to_odp(pktio_entry_t *pktio_entry, netmap_slot_t slot_tbl[], int16_t slot_num, odp_time_t *ts) { - pktio_ops_netmap_data_t *pkt_nm = - odp_ops_data(pktio_entry, netmap); + pktio_ops_netmap_data_t *pkt_nm = pktio_entry->s.ops_data; odp_packet_t pkt; odp_pool_t pool = pkt_nm->pool; odp_packet_hdr_t *pkt_hdr; @@ -750,8 +755,7 @@ static int netmap_recv(pktio_entry_t *pktio_entry, int index, odp_packet_t pkt_table[], int num) { struct nm_desc *desc; - pktio_ops_netmap_data_t *pkt_nm = - odp_ops_data(pktio_entry, netmap); + pktio_ops_netmap_data_t *pkt_nm = pktio_entry->s.ops_data; unsigned first_desc_id = pkt_nm->rx_desc_ring[index].s.first; unsigned last_desc_id = pkt_nm->rx_desc_ring[index].s.last; unsigned desc_id; @@ -804,8 +808,7 @@ static int netmap_recv(pktio_entry_t *pktio_entry, int index, static int netmap_send(pktio_entry_t *pktio_entry, int index, const odp_packet_t pkt_table[], int num) { - pktio_ops_netmap_data_t *pkt_nm = - odp_ops_data(pktio_entry, netmap); + pktio_ops_netmap_data_t *pkt_nm = pktio_entry->s.ops_data; struct pollfd polld; struct nm_desc *desc; struct netmap_ring *ring; @@ -880,8 +883,7 @@ static int netmap_send(pktio_entry_t *pktio_entry, int index, static int netmap_mac_addr_get(pktio_entry_t *pktio_entry, void *mac_addr) { - pktio_ops_netmap_data_t *pkt_nm = - odp_ops_data(pktio_entry, netmap); + pktio_ops_netmap_data_t *pkt_nm = pktio_entry->s.ops_data; memcpy(mac_addr, pkt_nm->if_mac, ETH_ALEN); return ETH_ALEN; @@ -889,8 +891,7 @@ static int netmap_mac_addr_get(pktio_entry_t *pktio_entry, void *mac_addr) static uint32_t netmap_mtu_get(pktio_entry_t *pktio_entry) { - pktio_ops_netmap_data_t *pkt_nm = - odp_ops_data(pktio_entry, netmap); + pktio_ops_netmap_data_t *pkt_nm = pktio_entry->s.ops_data; return pkt_nm->mtu; } @@ -898,8 +899,7 @@ static uint32_t netmap_mtu_get(pktio_entry_t *pktio_entry) static int netmap_promisc_mode_set(pktio_entry_t *pktio_entry, odp_bool_t enable) { - pktio_ops_netmap_data_t *pkt_nm = - odp_ops_data(pktio_entry, netmap); + pktio_ops_netmap_data_t *pkt_nm = pktio_entry->s.ops_data; if (pkt_nm->is_virtual) { __odp_errno = ENOTSUP; @@ -911,8 +911,7 @@ static int netmap_promisc_mode_set(pktio_entry_t *pktio_entry, static int netmap_promisc_mode_get(pktio_entry_t *pktio_entry) { - pktio_ops_netmap_data_t *pkt_nm = - odp_ops_data(pktio_entry, netmap); + pktio_ops_netmap_data_t *pkt_nm = pktio_entry->s.ops_data; if (pkt_nm->is_virtual) return 0; @@ -923,8 +922,7 @@ static int netmap_promisc_mode_get(pktio_entry_t *pktio_entry) static int netmap_capability(pktio_entry_t *pktio_entry, odp_pktio_capability_t *capa) { - pktio_ops_netmap_data_t *pkt_nm = - odp_ops_data(pktio_entry, netmap); + pktio_ops_netmap_data_t *pkt_nm = pktio_entry->s.ops_data; *capa = pkt_nm->capa; return 0; @@ -933,8 +931,7 @@ static int netmap_capability(pktio_entry_t *pktio_entry, static int netmap_stats(pktio_entry_t *pktio_entry, odp_pktio_stats_t *stats) { - pktio_ops_netmap_data_t *pkt_nm = - odp_ops_data(pktio_entry, netmap); + pktio_ops_netmap_data_t *pkt_nm = pktio_entry->s.ops_data; if (pktio_entry->s.stats_type == STATS_UNSUPPORTED) { memset(stats, 0, sizeof(*stats)); @@ -947,8 +944,7 @@ static int netmap_stats(pktio_entry_t *pktio_entry, static int netmap_stats_reset(pktio_entry_t *pktio_entry) { - pktio_ops_netmap_data_t *pkt_nm = - odp_ops_data(pktio_entry, netmap); + pktio_ops_netmap_data_t *pkt_nm = pktio_entry->s.ops_data; if (pktio_entry->s.stats_type == STATS_UNSUPPORTED) { memset(&pktio_entry->s.stats, 0, @@ -962,8 +958,7 @@ static int netmap_stats_reset(pktio_entry_t *pktio_entry) static void netmap_print(pktio_entry_t *pktio_entry) { odp_pktin_hash_proto_t hash_proto; - pktio_ops_netmap_data_t *pkt_nm = - odp_ops_data(pktio_entry, netmap); + pktio_ops_netmap_data_t *pkt_nm = pktio_entry->s.ops_data; if (rss_conf_get_fd(pkt_nm->sockfd, pkt_nm->if_name, &hash_proto)) rss_conf_print(&hash_proto); diff --git a/platform/linux-generic/pktio/pcap.c b/platform/linux-generic/pktio/pcap.c index 5bfaeef0..f3f00057 100644 --- a/platform/linux-generic/pktio/pcap.c +++ b/platform/linux-generic/pktio/pcap.c @@ -140,10 +140,17 @@ static int _pcapif_init_tx(pktio_ops_pcap_data_t *pcap) static int pcapif_init(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry, const char *devname, odp_pool_t pool) { - pktio_ops_pcap_data_t *pcap = odp_ops_data(pktio_entry, pcap); + pktio_ops_pcap_data_t *pcap = NULL; int ret; - memset(pcap, 0, sizeof(pktio_ops_pcap_data_t)); + pktio_entry->s.ops_data = ODP_OPS_DATA_ALLOC(sizeof(*pcap)); + if (odp_unlikely(pktio_entry->s.ops_data == NULL)) { + ODP_ERR("Failed to allocate pktio_ops_pcap_data_t struct"); + return -1; + } + pcap = pktio_entry->s.ops_data; + + memset(pcap, 0, sizeof(*pcap)); pcap->loop_cnt = 1; pcap->loops = 1; pcap->pool = pool; @@ -162,12 +169,15 @@ static int pcapif_init(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry, (void)pcapif_stats_reset(pktio_entry); + if (ret) + ODP_OPS_DATA_FREE(pktio_entry->s.ops_data); + return ret; } static int pcapif_close(pktio_entry_t *pktio_entry) { - pktio_ops_pcap_data_t *pcap = odp_ops_data(pktio_entry, pcap); + pktio_ops_pcap_data_t *pcap = pktio_entry->s.ops_data; if (pcap->tx_dump) pcap_dump_close(pcap->tx_dump); @@ -182,7 +192,7 @@ static int pcapif_close(pktio_entry_t *pktio_entry) free(pcap->fname_rx); free(pcap->fname_tx); - return 0; + return ODP_OPS_DATA_FREE(pktio_entry->s.ops_data); } static int _pcapif_reopen(pktio_ops_pcap_data_t *pcap) @@ -214,7 +224,7 @@ static int pcapif_recv_pkt(pktio_entry_t *pktio_entry, int index ODP_UNUSED, odp_packet_t pkt; odp_packet_hdr_t *pkt_hdr; uint32_t pkt_len; - pktio_ops_pcap_data_t *pcap = odp_ops_data(pktio_entry, pcap); + pktio_ops_pcap_data_t *pcap = pktio_entry->s.ops_data; odp_time_t ts_val; odp_time_t *ts = NULL; @@ -297,7 +307,7 @@ static int _pcapif_dump_pkt(pktio_ops_pcap_data_t *pcap, odp_packet_t pkt) static int pcapif_send_pkt(pktio_entry_t *pktio_entry, int index ODP_UNUSED, const odp_packet_t pkts[], int len) { - pktio_ops_pcap_data_t *pcap = odp_ops_data(pktio_entry, pcap); + pktio_ops_pcap_data_t *pcap = pktio_entry->s.ops_data; int i; odp_ticketlock_lock(&pktio_entry->s.txl); @@ -365,7 +375,7 @@ static int pcapif_promisc_mode_set(pktio_entry_t *pktio_entry, { char filter_exp[64] = {0}; struct bpf_program bpf; - pktio_ops_pcap_data_t *pcap = odp_ops_data(pktio_entry, pcap); + pktio_ops_pcap_data_t *pcap = pktio_entry->s.ops_data; if (!pcap->rx) { pcap->promisc = enable; @@ -405,7 +415,7 @@ static int pcapif_promisc_mode_set(pktio_entry_t *pktio_entry, static int pcapif_promisc_mode_get(pktio_entry_t *pktio_entry) { - pktio_ops_pcap_data_t *pcap = odp_ops_data(pktio_entry, pcap); + pktio_ops_pcap_data_t *pcap = pktio_entry->s.ops_data; return pcap->promisc; } diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index d9f85b29..7e0485b9 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -110,16 +110,21 @@ int sendmmsg(int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags) */ static int sock_close(pktio_entry_t *pktio_entry) { - pktio_ops_socket_data_t *pkt_sock = - odp_ops_data(pktio_entry, socket); + int result = 0; + pktio_ops_socket_data_t *pkt_sock = pktio_entry->s.ops_data; if (pkt_sock->sockfd != -1 && close(pkt_sock->sockfd) != 0) { __odp_errno = errno; ODP_ERR("close(sockfd): %s\n", strerror(errno)); - return -1; + result = -1; } - return 0; + if (ODP_OPS_DATA_FREE(pktio_entry->s.ops_data)) { + ODP_ERR("ops_data_free(socket) failed\n"); + result = -1; + } + + return result; } /* @@ -134,18 +139,25 @@ static int sock_setup_pkt(pktio_entry_t *pktio_entry, const char *netdev, struct ifreq ethreq; struct sockaddr_ll sa_ll; char shm_name[ODP_SHM_NAME_LEN]; - pktio_ops_socket_data_t *pkt_sock = - odp_ops_data(pktio_entry, socket); + pktio_ops_socket_data_t *pkt_sock = NULL; odp_pktio_stats_t cur_stats; + if (pool == ODP_POOL_INVALID) + return -1; + + pktio_entry->s.ops_data = ODP_OPS_DATA_ALLOC(sizeof(*pkt_sock)); + if (odp_unlikely(pktio_entry->s.ops_data == NULL)) { + ODP_ERR("Failed to allocate pktio_ops_socket_data_t struct"); + return -1; + } + pkt_sock = pktio_entry->s.ops_data; + /* Init pktio entry */ memset(pkt_sock, 0, sizeof(*pkt_sock)); /* set sockfd to -1, because a valid socked might be initialized to 0 */ pkt_sock->sockfd = -1; - - if (pool == ODP_POOL_INVALID) - return -1; pkt_sock->pool = pool; + snprintf(shm_name, ODP_SHM_NAME_LEN, "%s-%s", "pktio", netdev); shm_name[ODP_SHM_NAME_LEN - 1] = '\0'; @@ -212,7 +224,6 @@ static int sock_setup_pkt(pktio_entry_t *pktio_entry, const char *netdev, error: sock_close(pktio_entry); - return -1; } @@ -259,8 +270,7 @@ static uint32_t _rx_pkt_to_iovec(odp_packet_t pkt, static int sock_mmsg_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, odp_packet_t pkt_table[], int len) { - pktio_ops_socket_data_t *pkt_sock = - odp_ops_data(pktio_entry, socket); + pktio_ops_socket_data_t *pkt_sock = pktio_entry->s.ops_data; odp_pool_t pool = pkt_sock->pool; odp_time_t ts_val; odp_time_t *ts = NULL; @@ -375,8 +385,7 @@ static uint32_t _tx_pkt_to_iovec(odp_packet_t pkt, static int sock_mmsg_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, const odp_packet_t pkt_table[], int len) { - pktio_ops_socket_data_t *pkt_sock = - odp_ops_data(pktio_entry, socket); + pktio_ops_socket_data_t *pkt_sock = pktio_entry->s.ops_data; struct mmsghdr msgvec[len]; struct iovec iovecs[len][MAX_SEGS]; int ret; @@ -422,8 +431,7 @@ static int sock_mmsg_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, */ static uint32_t sock_mtu_get(pktio_entry_t *pktio_entry) { - pktio_ops_socket_data_t *pkt_sock = - odp_ops_data(pktio_entry, socket); + pktio_ops_socket_data_t *pkt_sock = pktio_entry->s.ops_data; return pkt_sock->mtu; } @@ -434,8 +442,7 @@ static uint32_t sock_mtu_get(pktio_entry_t *pktio_entry) static int sock_mac_addr_get(pktio_entry_t *pktio_entry, void *mac_addr) { - pktio_ops_socket_data_t *pkt_sock = - odp_ops_data(pktio_entry, socket); + pktio_ops_socket_data_t *pkt_sock = pktio_entry->s.ops_data; memcpy(mac_addr, pkt_sock->if_mac, ETH_ALEN); return ETH_ALEN; @@ -447,8 +454,7 @@ static int sock_mac_addr_get(pktio_entry_t *pktio_entry, static int sock_promisc_mode_set(pktio_entry_t *pktio_entry, odp_bool_t enable) { - pktio_ops_socket_data_t *pkt_sock = - odp_ops_data(pktio_entry, socket); + pktio_ops_socket_data_t *pkt_sock = pktio_entry->s.ops_data; return promisc_mode_set_fd(pkt_sock->sockfd, pktio_entry->s.name, enable); @@ -459,8 +465,7 @@ static int sock_promisc_mode_set(pktio_entry_t *pktio_entry, */ static int sock_promisc_mode_get(pktio_entry_t *pktio_entry) { - pktio_ops_socket_data_t *pkt_sock = - odp_ops_data(pktio_entry, socket); + pktio_ops_socket_data_t *pkt_sock = pktio_entry->s.ops_data; return promisc_mode_get_fd(pkt_sock->sockfd, pktio_entry->s.name); @@ -468,8 +473,7 @@ static int sock_promisc_mode_get(pktio_entry_t *pktio_entry) static int sock_link_status(pktio_entry_t *pktio_entry) { - pktio_ops_socket_data_t *pkt_sock = - odp_ops_data(pktio_entry, socket); + pktio_ops_socket_data_t *pkt_sock = pktio_entry->s.ops_data; return link_status_fd(pkt_sock->sockfd, pktio_entry->s.name); @@ -493,8 +497,7 @@ static int sock_capability(pktio_entry_t *pktio_entry ODP_UNUSED, static int sock_stats(pktio_entry_t *pktio_entry, odp_pktio_stats_t *stats) { - pktio_ops_socket_data_t *pkt_sock = - odp_ops_data(pktio_entry, socket); + pktio_ops_socket_data_t *pkt_sock = pktio_entry->s.ops_data; if (pktio_entry->s.stats_type == STATS_UNSUPPORTED) { memset(stats, 0, sizeof(*stats)); @@ -506,8 +509,7 @@ static int sock_stats(pktio_entry_t *pktio_entry, static int sock_stats_reset(pktio_entry_t *pktio_entry) { - pktio_ops_socket_data_t *pkt_sock = - odp_ops_data(pktio_entry, socket); + pktio_ops_socket_data_t *pkt_sock = pktio_entry->s.ops_data; if (pktio_entry->s.stats_type == STATS_UNSUPPORTED) { memset(&pktio_entry->s.stats, 0, diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index b5c27ef4..271c2f0f 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -494,23 +494,27 @@ static int mmap_bind_sock(pktio_ops_socket_mmap_data_t *pkt_sock, static int sock_mmap_close(pktio_entry_t *entry) { - pktio_ops_socket_mmap_data_t - *const pkt_sock = odp_ops_data(entry, socket_mmap); + pktio_ops_socket_mmap_data_t *const pkt_sock = entry->s.ops_data; int ret; + int status = 0; ret = mmap_unmap_sock(pkt_sock); if (ret != 0) { ODP_ERR("mmap_unmap_sock() %s\n", strerror(errno)); - return -1; + status = -1; } if (pkt_sock->sockfd != -1 && close(pkt_sock->sockfd) != 0) { __odp_errno = errno; ODP_ERR("close(sockfd): %s\n", strerror(errno)); - return -1; + status = -1; } - return 0; + if (ODP_OPS_DATA_FREE(entry->s.ops_data)) { + ODP_ERR("ops_data_free(sock_mmap) failed\n"); + status = -1; + } + return status; } static int sock_mmap_open(odp_pktio_t id ODP_UNUSED, @@ -520,22 +524,27 @@ static int sock_mmap_open(odp_pktio_t id ODP_UNUSED, int if_idx; int ret = 0; odp_pktio_stats_t cur_stats; + pktio_ops_socket_mmap_data_t *pkt_sock; + int fanout = 1; if (disable_pktio) return -1; - pktio_ops_socket_mmap_data_t - *const pkt_sock = odp_ops_data(pktio_entry, socket_mmap); - int fanout = 1; + if (pool == ODP_POOL_INVALID) + return -1; + + pktio_entry->s.ops_data = ODP_OPS_DATA_ALLOC(sizeof(*pkt_sock)); + if (odp_unlikely(pktio_entry->s.ops_data == NULL)) { + ODP_ERR("Failed to allocate pktio_ops_socket_mmap_data_t struct"); + return -1; + } + pkt_sock = pktio_entry->s.ops_data; /* Init pktio entry */ memset(pkt_sock, 0, sizeof(*pkt_sock)); /* set sockfd to -1, because a valid socked might be initialized to 0 */ pkt_sock->sockfd = -1; - if (pool == ODP_POOL_INVALID) - return -1; - /* Store eth buffer offset for pkt buffers from this pool */ pkt_sock->frame_offset = 0; @@ -610,8 +619,7 @@ error: static int sock_mmap_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, odp_packet_t pkt_table[], int len) { - pktio_ops_socket_mmap_data_t - *const pkt_sock = odp_ops_data(pktio_entry, socket_mmap); + pktio_ops_socket_mmap_data_t *const pkt_sock = pktio_entry->s.ops_data; int ret; odp_ticketlock_lock(&pktio_entry->s.rxl); @@ -626,8 +634,7 @@ static int sock_mmap_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, const odp_packet_t pkt_table[], int len) { int ret; - pktio_ops_socket_mmap_data_t - *const pkt_sock = odp_ops_data(pktio_entry, socket_mmap); + pktio_ops_socket_mmap_data_t *const pkt_sock = pktio_entry->s.ops_data; odp_ticketlock_lock(&pktio_entry->s.txl); ret = pkt_mmap_v2_tx(pkt_sock->tx_ring.sock, &pkt_sock->tx_ring, @@ -639,16 +646,14 @@ static int sock_mmap_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, static uint32_t sock_mmap_mtu_get(pktio_entry_t *pktio_entry) { - pktio_ops_socket_mmap_data_t - *const pkt_sock = odp_ops_data(pktio_entry, socket_mmap); + pktio_ops_socket_mmap_data_t *const pkt_sock = pktio_entry->s.ops_data; return mtu_get_fd(pkt_sock->sockfd, pktio_entry->s.name); } static int sock_mmap_mac_addr_get(pktio_entry_t *pktio_entry, void *mac_addr) { - pktio_ops_socket_mmap_data_t - *const pkt_sock = odp_ops_data(pktio_entry, socket_mmap); + pktio_ops_socket_mmap_data_t *const pkt_sock = pktio_entry->s.ops_data; memcpy(mac_addr, pkt_sock->if_mac, ETH_ALEN); return ETH_ALEN; @@ -657,8 +662,7 @@ static int sock_mmap_mac_addr_get(pktio_entry_t *pktio_entry, void *mac_addr) static int sock_mmap_promisc_mode_set(pktio_entry_t *pktio_entry, odp_bool_t enable) { - pktio_ops_socket_mmap_data_t - *const pkt_sock = odp_ops_data(pktio_entry, socket_mmap); + pktio_ops_socket_mmap_data_t *const pkt_sock = pktio_entry->s.ops_data; return promisc_mode_set_fd(pkt_sock->sockfd, pktio_entry->s.name, enable); @@ -666,8 +670,7 @@ static int sock_mmap_promisc_mode_set(pktio_entry_t *pktio_entry, static int sock_mmap_promisc_mode_get(pktio_entry_t *pktio_entry) { - pktio_ops_socket_mmap_data_t - *const pkt_sock = odp_ops_data(pktio_entry, socket_mmap); + pktio_ops_socket_mmap_data_t *const pkt_sock = pktio_entry->s.ops_data; return promisc_mode_get_fd(pkt_sock->sockfd, pktio_entry->s.name); @@ -675,8 +678,7 @@ static int sock_mmap_promisc_mode_get(pktio_entry_t *pktio_entry) static int sock_mmap_link_status(pktio_entry_t *pktio_entry) { - pktio_ops_socket_mmap_data_t - *const pkt_sock = odp_ops_data(pktio_entry, socket_mmap); + pktio_ops_socket_mmap_data_t *const pkt_sock = pktio_entry->s.ops_data; return link_status_fd(pkt_sock->sockfd, pktio_entry->s.name); } @@ -699,8 +701,7 @@ static int sock_mmap_capability(pktio_entry_t *pktio_entry ODP_UNUSED, static int sock_mmap_stats(pktio_entry_t *pktio_entry, odp_pktio_stats_t *stats) { - pktio_ops_socket_mmap_data_t - *const pkt_sock = odp_ops_data(pktio_entry, socket_mmap); + pktio_ops_socket_mmap_data_t *const pkt_sock = pktio_entry->s.ops_data; if (pktio_entry->s.stats_type == STATS_UNSUPPORTED) { memset(stats, 0, sizeof(*stats)); @@ -713,8 +714,7 @@ static int sock_mmap_stats(pktio_entry_t *pktio_entry, static int sock_mmap_stats_reset(pktio_entry_t *pktio_entry) { - pktio_ops_socket_mmap_data_t - *const pkt_sock = odp_ops_data(pktio_entry, socket_mmap); + pktio_ops_socket_mmap_data_t *const pkt_sock = pktio_entry->s.ops_data; if (pktio_entry->s.stats_type == STATS_UNSUPPORTED) { memset(&pktio_entry->s.stats, 0, diff --git a/platform/linux-generic/pktio/tap.c b/platform/linux-generic/pktio/tap.c index 5bc7481d..bb404d91 100644 --- a/platform/linux-generic/pktio/tap.c +++ b/platform/linux-generic/pktio/tap.c @@ -92,23 +92,31 @@ static int tap_pktio_open(odp_pktio_t id ODP_UNUSED, int fd, skfd, flags; uint32_t mtu; struct ifreq ifr; - pktio_ops_tap_data_t *tap = odp_ops_data(pktio_entry, tap); + pktio_ops_tap_data_t *tap = NULL; if (strncmp(devname, "tap:", 4) != 0) return -1; + if (pool == ODP_POOL_INVALID) + return -1; + + pktio_entry->s.ops_data = ODP_OPS_DATA_ALLOC(sizeof(*tap)); + if (odp_unlikely(pktio_entry->s.ops_data == NULL)) { + ODP_ERR("Failed to allocate pktio_ops_tap_data_t struct"); + return -1; + } + tap = pktio_entry->s.ops_data; + /* Init pktio entry */ memset(tap, 0, sizeof(*tap)); tap->fd = -1; tap->skfd = -1; - if (pool == ODP_POOL_INVALID) - return -1; - fd = open("/dev/net/tun", O_RDWR); if (fd < 0) { __odp_errno = errno; ODP_ERR("failed to open /dev/net/tun: %s\n", strerror(errno)); + ODP_OPS_DATA_FREE(pktio_entry->s.ops_data); return -1; } @@ -170,13 +178,14 @@ sock_err: tap_err: close(fd); ODP_ERR("Tap device alloc failed.\n"); + ODP_OPS_DATA_FREE(pktio_entry->s.ops_data); return -1; } static int tap_pktio_start(pktio_entry_t *pktio_entry) { struct ifreq ifr; - pktio_ops_tap_data_t *tap = odp_ops_data(pktio_entry, tap); + pktio_ops_tap_data_t *tap = pktio_entry->s.ops_data; odp_memset(&ifr, 0, sizeof(ifr)); snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", @@ -207,7 +216,7 @@ sock_err: static int tap_pktio_stop(pktio_entry_t *pktio_entry) { struct ifreq ifr; - pktio_ops_tap_data_t *tap = odp_ops_data(pktio_entry, tap); + pktio_ops_tap_data_t *tap = pktio_entry->s.ops_data; odp_memset(&ifr, 0, sizeof(ifr)); snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", @@ -238,7 +247,7 @@ sock_err: static int tap_pktio_close(pktio_entry_t *pktio_entry) { int ret = 0; - pktio_ops_tap_data_t *tap = odp_ops_data(pktio_entry, tap); + pktio_ops_tap_data_t *tap = pktio_entry->s.ops_data; if (tap->fd != -1 && close(tap->fd) != 0) { __odp_errno = errno; @@ -252,13 +261,18 @@ static int tap_pktio_close(pktio_entry_t *pktio_entry) ret = -1; } + if (ODP_OPS_DATA_FREE(pktio_entry->s.ops_data)) { + ODP_ERR("ops_data_free(tap) failed\n"); + ret = -1; + } + return ret; } static odp_packet_t pack_odp_pkt(pktio_entry_t *pktio_entry, const void *data, unsigned int len, odp_time_t *ts) { - pktio_ops_tap_data_t *tap = odp_ops_data(pktio_entry, tap); + pktio_ops_tap_data_t *tap = pktio_entry->s.ops_data; odp_packet_t pkt; odp_packet_hdr_t *pkt_hdr; odp_packet_hdr_t parsed_hdr; @@ -302,7 +316,7 @@ static int tap_pktio_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, ssize_t retval; int i; uint8_t buf[BUF_SIZE]; - pktio_ops_tap_data_t *tap = odp_ops_data(pktio_entry, tap); + pktio_ops_tap_data_t *tap = pktio_entry->s.ops_data; odp_time_t ts_val; odp_time_t *ts = NULL; @@ -342,7 +356,7 @@ static int tap_pktio_send_lockless(pktio_entry_t *pktio_entry, int i, n; uint32_t pkt_len; uint8_t buf[BUF_SIZE]; - pktio_ops_tap_data_t *tap = odp_ops_data(pktio_entry, tap); + pktio_ops_tap_data_t *tap = pktio_entry->s.ops_data; for (i = 0; i < len; i++) { pkt_len = odp_packet_len(pkts[i]); @@ -404,7 +418,7 @@ static int tap_pktio_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, static uint32_t tap_mtu_get(pktio_entry_t *pktio_entry) { uint32_t ret; - pktio_ops_tap_data_t *tap = odp_ops_data(pktio_entry, tap); + pktio_ops_tap_data_t *tap = pktio_entry->s.ops_data; ret = mtu_get_fd(tap->skfd, pktio_entry->s.name + 4); if (ret > 0) @@ -416,7 +430,7 @@ static uint32_t tap_mtu_get(pktio_entry_t *pktio_entry) static int tap_promisc_mode_set(pktio_entry_t *pktio_entry, odp_bool_t enable) { - pktio_ops_tap_data_t *tap = odp_ops_data(pktio_entry, tap); + pktio_ops_tap_data_t *tap = pktio_entry->s.ops_data; return promisc_mode_set_fd(tap->skfd, pktio_entry->s.name + 4, enable); @@ -424,14 +438,14 @@ static int tap_promisc_mode_set(pktio_entry_t *pktio_entry, static int tap_promisc_mode_get(pktio_entry_t *pktio_entry) { - pktio_ops_tap_data_t *tap = odp_ops_data(pktio_entry, tap); + pktio_ops_tap_data_t *tap = pktio_entry->s.ops_data; return promisc_mode_get_fd(tap->skfd, pktio_entry->s.name + 4); } static int tap_mac_addr_get(pktio_entry_t *pktio_entry, void *mac_addr) { - pktio_ops_tap_data_t *tap = odp_ops_data(pktio_entry, tap); + pktio_ops_tap_data_t *tap = pktio_entry->s.ops_data; memcpy(mac_addr, tap->if_mac, ETH_ALEN); return ETH_ALEN; @@ -439,7 +453,7 @@ static int tap_mac_addr_get(pktio_entry_t *pktio_entry, void *mac_addr) static int tap_mac_addr_set(pktio_entry_t *pktio_entry, const void *mac_addr) { - pktio_ops_tap_data_t *tap = odp_ops_data(pktio_entry, tap); + pktio_ops_tap_data_t *tap = pktio_entry->s.ops_data; memcpy(tap->if_mac, mac_addr, ETH_ALEN); @@ -449,7 +463,7 @@ static int tap_mac_addr_set(pktio_entry_t *pktio_entry, const void *mac_addr) static int tap_link_status(pktio_entry_t *pktio_entry) { - pktio_ops_tap_data_t *tap = odp_ops_data(pktio_entry, tap); + pktio_ops_tap_data_t *tap = pktio_entry->s.ops_data; return link_status_fd(tap->skfd, pktio_entry->s.name + 4); } commit 69b652f16d08a7d45169ce224a8a9efe03dd20e4 Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Mon Nov 20 11:02:14 2017 +0200 linux-gen: pktio: add pktio operations data pool Pktio instances need a memory area where to store configuration or state information. The size and structure of this area depends on pktio type. This pool is meant to be used for allocation of such memory areas. Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com> Reviewed-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am index f27d2b50..ee6c36e2 100644 --- a/platform/linux-dpdk/Makefile.am +++ b/platform/linux-dpdk/Makefile.am @@ -206,6 +206,8 @@ noinst_HEADERS = \ ${top_srcdir}/platform/linux-generic/include/odp_packet_io_internal.h \ ${srcdir}/include/odp_errno_define.h \ ${top_srcdir}/platform/linux-generic/include/odp_packet_io_ring_internal.h \ + ${top_srcdir}/platform/linux-generic/include/odp_packet_io_pool.h \ + ${top_srcdir}/platform/linux-generic/include/odp_packet_io_pool_access.h \ ${top_srcdir}/platform/linux-generic/include/odp_pkt_queue_internal.h \ ${srcdir}/include/odp_pool_internal.h \ ${top_srcdir}/platform/linux-generic/include/odp_pool_subsystem.h \ @@ -260,6 +262,7 @@ __LIB__libodp_dpdk_la_SOURCES = \ ../linux-generic/pktio/subsystem.c \ odp_packet_flags.c \ ../linux-generic/odp_packet_io.c \ + ../linux-generic/odp_packet_io_pool.c \ ../linux-generic/pktio/loopback.c \ ../linux-generic/odp_pkt_queue.c \ pool/dpdk.c \ diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 56ef03c6..a4aaa769 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -175,6 +175,8 @@ noinst_HEADERS = \ include/odp_name_table_internal.h \ include/odp_packet_internal.h \ include/odp_packet_io_internal.h \ + include/odp_packet_io_pool.h \ + include/odp_packet_io_pool_access.h \ include/odp_packet_io_ring_internal.h \ pktio/ethtool.h \ pktio/common.h \ @@ -244,6 +246,7 @@ __LIB__libodp_linux_la_SOURCES = \ odp_packet.c \ odp_packet_flags.c \ odp_packet_io.c \ + odp_packet_io_pool.c \ pktio/ethtool.c \ pktio/subsystem.c \ pktio/ipc.c \ diff --git a/platform/linux-generic/include/odp_packet_io_pool.h b/platform/linux-generic/include/odp_packet_io_pool.h new file mode 100644 index 00000000..59ad053b --- /dev/null +++ b/platform/linux-generic/include/odp_packet_io_pool.h @@ -0,0 +1,27 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP packet IO pool + */ + +#ifndef ODP_PACKET_IO_POOL_H_ +#define ODP_PACKET_IO_POOL_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +int _odp_packet_io_pool_create(void); +int _odp_packet_io_pool_destroy(void); + +#ifdef __cplusplus +} +#endif + +#endif /* ODP_PACKET_IO_POOL_H_*/ diff --git a/platform/linux-generic/include/odp_packet_io_pool_access.h b/platform/linux-generic/include/odp_packet_io_pool_access.h new file mode 100644 index 00000000..cdd7dd96 --- /dev/null +++ b/platform/linux-generic/include/odp_packet_io_pool_access.h @@ -0,0 +1,58 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP packet IO pool + */ + +#ifndef ODP_PACKET_IO_POOL_ACCESS_H_ +#define ODP_PACKET_IO_POOL_ACCESS_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp/api/align.h> +#include <odp/drv/shm.h> + +/** + * Packet IO operations data pool name + */ +#define ODP_PKTIO_OPS_DATA_POOL_NAME "ODP_PKTIO_OPS_DATA" + +#define ODP_OPS_DATA_ALLOC(_size) \ +({ \ + odpdrv_shm_pool_t _pool; \ + void *_ops_data = NULL; \ + \ + _pool = odpdrv_shm_pool_lookup(ODP_PKTIO_OPS_DATA_POOL_NAME); \ + if (_pool != ODPDRV_SHM_POOL_INVALID) \ + _ops_data = odpdrv_shm_pool_alloc(_pool, \ + ROUNDUP_CACHE_LINE(_size)); \ + \ + _ops_data; \ +}) + +#define ODP_OPS_DATA_FREE(_ops_data) \ +({ \ + odpdrv_shm_pool_t _pool; \ + int _result = -1; \ + \ + _pool = odpdrv_shm_pool_lookup(ODP_PKTIO_OPS_DATA_POOL_NAME); \ + if (_pool != ODPDRV_SHM_POOL_INVALID) { \ + odpdrv_shm_pool_free(_pool, _ops_data); \ + _result = 0; \ + } \ + _result; \ +}) + +#ifdef __cplusplus +} +#endif + +#endif /* ODP_PACKET_IO_POOL_ACCESS_H_*/ diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index a1c70861..efeac026 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -10,6 +10,7 @@ #include <odp/api/packet_io.h> #include <odp_packet_io_internal.h> +#include <odp_packet_io_pool.h> #include <odp/api/packet.h> #include <odp_packet_internal.h> #include <odp_internal.h> @@ -76,6 +77,10 @@ int odp_pktio_init_global(void) pktio_entry_ptr[i] = pktio_entry; } + if (_odp_packet_io_pool_create()) { + odp_shm_free(shm); + return -1; + } return odp_pktio_ops_init_global(true); } @@ -1122,6 +1127,10 @@ int odp_pktio_term_global(void) ret = odp_pktio_ops_term_global(false); + ret = _odp_packet_io_pool_destroy(); + if (ret) + ODP_ERR("unable to destroy pktio pool\n"); + ret = odp_shm_free(odp_shm_lookup("odp_pktio_entries")); if (ret != 0) ODP_ERR("shm free failed for odp_pktio_entries"); diff --git a/platform/linux-generic/odp_packet_io_pool.c b/platform/linux-generic/odp_packet_io_pool.c new file mode 100644 index 00000000..3e186047 --- /dev/null +++ b/platform/linux-generic/odp_packet_io_pool.c @@ -0,0 +1,55 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include <odp_posix_extensions.h> +#include <odp/api/packet_io.h> +#include <odp/api/std_clib.h> +#include <odp/drv/shm.h> +#include "odp_packet_io_pool.h" +#include "odp_packet_io_pool_access.h" +#include "odp_debug_internal.h" + +#define ODP_PKTIO_OPS_DATA_POOL_SIZE 160000 + +int _odp_packet_io_pool_create(void) +{ + odpdrv_shm_pool_t pktio_ops_pool; + odpdrv_shm_pool_param_t pktio_ops_param; + + odp_memset(&pktio_ops_param, 0, sizeof(pktio_ops_param)); + pktio_ops_param.pool_size = ODP_PKTIO_OPS_DATA_POOL_SIZE; + pktio_ops_param.min_alloc = 1; + pktio_ops_param.max_alloc = ODP_PKTIO_OPS_DATA_POOL_SIZE; + + pktio_ops_pool = odpdrv_shm_pool_create(ODP_PKTIO_OPS_DATA_POOL_NAME, + &pktio_ops_param); + if (pktio_ops_pool == ODPDRV_SHM_POOL_INVALID) { + ODP_ERR("error to pool_create pktio_ops pool\n"); + return -1; + } + + return 0; +} + +int _odp_packet_io_pool_destroy(void) +{ + odpdrv_shm_pool_t pktio_ops_pool; + + pktio_ops_pool = odpdrv_shm_pool_lookup(ODP_PKTIO_OPS_DATA_POOL_NAME); + if (pktio_ops_pool == ODPDRV_SHM_POOL_INVALID) { + ODP_ERR("error pool_lookup pktio_ops pool\n"); + return -1; + } + + if (odpdrv_shm_pool_destroy(pktio_ops_pool)) { + ODP_ERR("error pool_destroy pktio_ops pool\n"); + return -1; + } + + return 0; +} commit 4477da1a8ef61cff56b021dc8bf28bfde40ee8ba Author: Josep Puigdemont <josep.puigdemont(a)linaro.org> Date: Thu Jun 8 13:18:51 2017 +0200 driver.h: add parameter when registering enumerators If a class registers more than once the same enumerator, as it could happen for different PCI platforms, we need to provide information for the enumerator probe function to know where to act. This information shall be provided in the odpdrv_enumr_param_t structure as a void pointer, which will be passed to the probe() function of the enumerator. Signed-off-by: Josep Puigdemont <josep.puigdemont(a)linaro.org> Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com> Reviewed-by: Yi He <yi.he(a)linaro.org> diff --git a/example/ddf_ifs/ddf_ifs_enumr_dpdk.c b/example/ddf_ifs/ddf_ifs_enumr_dpdk.c index 782f7b74..258865df 100644 --- a/example/ddf_ifs/ddf_ifs_enumr_dpdk.c +++ b/example/ddf_ifs/ddf_ifs_enumr_dpdk.c @@ -17,7 +17,7 @@ static odpdrv_enumr_t dpdk_enumr; static odpdrv_device_t dpdk_dev[DDF_DPDK_DEV_MAX]; static int dpdk_dev_cnt; -static int dpdk_enumr_probe(void) +static int dpdk_enumr_probe(void *data __attribute__((__unused__))) { int dpdk_dev_cnt_detected = TEST_DPDK_DEV_CNT; /* detected with dpdk APIs*/ @@ -46,7 +46,7 @@ static int dpdk_enumr_probe(void) return 0; } -static int dpdk_enumr_remove(void) +static int dpdk_enumr_remove(void *data __attribute__((__unused__))) { printf("%s()\n", __func__); return 0; diff --git a/example/ddf_ifs/ddf_ifs_enumr_generic.c b/example/ddf_ifs/ddf_ifs_enumr_generic.c index f5e1a2cb..5cfa1d9a 100644 --- a/example/ddf_ifs/ddf_ifs_enumr_generic.c +++ b/example/ddf_ifs/ddf_ifs_enumr_generic.c @@ -11,13 +11,13 @@ static odpdrv_enumr_t gen_enumr; -static int gen_enumr_probe(void) +static int gen_enumr_probe(void *data __attribute__((__unused__))) { printf("%s() - no devices found\n", __func__); return 0; } -static int gen_enumr_remove(void) +static int gen_enumr_remove(void *data __attribute__((__unused__))) { printf("%s()\n", __func__); return 0; diff --git a/include/odp/drv/spec/driver.h b/include/odp/drv/spec/driver.h index 224baf4f..51baedb5 100644 --- a/include/odp/drv/spec/driver.h +++ b/include/odp/drv/spec/driver.h @@ -205,12 +205,12 @@ struct odpdrv_enumr_param_t { * Called by ODP when it is ready for device creation/deletion * returns an negative value on error or 0 on success. */ - int (*probe)(void); + int (*probe)(void *enumr_data); /** Remove function: * destroy all enumerated devices and release all resources */ - int (*remove)(void); + int (*remove)(void *enumr_data); /** Register event notifier function for hotplug events: * register_notifier(fcnt,event_mask) registers fcnt as a callback when @@ -218,6 +218,12 @@ struct odpdrv_enumr_param_t { */ int (*register_notifier)(void (*event_handler) (uint64_t event), int64_t event_mask); + + /** Class dependent part + * This part is allocated by the enumerator class for use by the + * enumerator, it is passed as a parameter to the probe function. + */ + void *enumr_data; }; /* The following events are supported by enumerators */ diff --git a/platform/linux-generic/drv_driver.c b/platform/linux-generic/drv_driver.c index ecf75ab9..cfb42f11 100644 --- a/platform/linux-generic/drv_driver.c +++ b/platform/linux-generic/drv_driver.c @@ -851,7 +851,7 @@ void _odpdrv_driver_probe_drv_items(void) enumr = enumr_lst.head; while (enumr) { if (!enumr->probed) { - enumr->param.probe(); + enumr->param.probe(enumr->param.enumr_data); enumr->probed = 1; } enumr = enumr->next; @@ -1055,7 +1055,7 @@ int _odpdrv_driver_term_global(void) while (enumr_lst.head) { enumr = enumr_lst.head; if (enumr->param.remove) { /* run remove callback, if any */ - if (enumr->param.remove()) + if (enumr->param.remove(enumr->param.enumr_data)) ODP_ERR("Enumerator (API %s) removal failed.\n", enumr->param.api_name); } diff --git a/test/validation/drv/drvdriver/drvdriver_device.c b/test/validation/drv/drvdriver/drvdriver_device.c index d010026f..eaf7dcfa 100644 --- a/test/validation/drv/drvdriver/drvdriver_device.c +++ b/test/validation/drv/drvdriver/drvdriver_device.c @@ -22,8 +22,8 @@ typedef struct dev_enumr_data_t { /* enumerator data for registered devices */ #define NB_DEVICES 5 /* forward declaration */ -static int enumr1_probe(void); -static int enumr1_remove(void); +static int enumr1_probe(void *); +static int enumr1_remove(void *); static int enumr_class1_probe(void); static int enumr_class1_remove(void); @@ -68,7 +68,8 @@ static odpdrv_enumr_t enumr1_register(void) .api_version = 1, .probe = enumr1_probe, .remove = enumr1_remove, - .register_notifier = NULL + .register_notifier = NULL, + .enumr_data = NULL }; enumr1 = odpdrv_enumr_register(&param); @@ -76,7 +77,7 @@ static odpdrv_enumr_t enumr1_register(void) } /*enumerator probe functions, just making sure they have been run: */ -static int enumr1_probe(void) +static int enumr1_probe(void *enumr_data __attribute__((__unused__))) { int dev; odpdrv_shm_t shm; @@ -128,7 +129,7 @@ static void enumr5_device_destroy_terminate(void *priv_data) } /*enumerator remove functions, to remove the enumerated devices: */ -static int enumr1_remove(void) +static int enumr1_remove(void *data __attribute__((__unused__))) { odpdrv_device_t *my_devices; odpdrv_device_t *dev; diff --git a/test/validation/drv/drvdriver/drvdriver_driver.c b/test/validation/drv/drvdriver/drvdriver_driver.c index edcb0f43..eeb424cc 100644 --- a/test/validation/drv/drvdriver/drvdriver_driver.c +++ b/test/validation/drv/drvdriver/drvdriver_driver.c @@ -56,10 +56,10 @@ static int driver1_probed_index; static int driver2_probed_index; /* forward declaration */ -static int enumr1_probe(void); -static int enumr2_probe(void); -static int enumr1_remove(void); -static int enumr2_remove(void); +static int enumr1_probe(void *); +static int enumr2_probe(void *); +static int enumr1_remove(void *); +static int enumr2_remove(void *); static int enumr_class1_probe(void); static int enumr_class2_probe(void); static int driver1_probe(odpdrv_device_t dev, odpdrv_devio_t devio, int idx); @@ -167,8 +167,10 @@ static int enumr_class2_probe(void) return 0; } +#define UNUSED __attribute__((__unused__)) + /*enumerator probe functions, creating four devices each: */ -static int enumr1_probe(void) +static int enumr1_probe(void *enumr_data UNUSED) { int dev; @@ -189,7 +191,7 @@ static int enumr1_probe(void) return 0; } -static int enumr2_probe(void) +static int enumr2_probe(void *enumr_data UNUSED) { int dev; @@ -211,7 +213,7 @@ static int enumr2_probe(void) } /*enumerator remove functions, to remove the enumerated devices: */ -static int enumr1_remove(void) +static int enumr1_remove(void *data UNUSED) { odpdrv_device_t *my_devices; odpdrv_device_t *dev; @@ -231,7 +233,7 @@ static int enumr1_remove(void) return 0; } -static int enumr2_remove(void) +static int enumr2_remove(void *data UNUSED) { odpdrv_device_t *my_devices; odpdrv_device_t *dev; diff --git a/test/validation/drv/drvdriver/drvdriver_enumr.c b/test/validation/drv/drvdriver/drvdriver_enumr.c index 38aac3d0..04b6dcdb 100644 --- a/test/validation/drv/drvdriver/drvdriver_enumr.c +++ b/test/validation/drv/drvdriver/drvdriver_enumr.c @@ -20,15 +20,15 @@ static int enumr3_probed; static int enumr4_probed; /* forward declaration */ -static int enumr1_probe(void); -static int enumr2_probe(void); -static int enumr3_probe(void); -static int enumr4_probe(void); +static int enumr1_probe(void *); +static int enumr2_probe(void *); +static int enumr3_probe(void *); +static int enumr4_probe(void *); -static int enumr1_remove(void); -static int enumr2_remove(void); -static int enumr3_remove(void); -static int enumr4_remove(void); +static int enumr1_remove(void *); +static int enumr2_remove(void *); +static int enumr3_remove(void *); +static int enumr4_remove(void *); static int enumr_class1_probe(void); static int enumr_class2_probe(void); @@ -68,6 +68,8 @@ static int tests_global_term(void) return 0; } +#define ENUMR1_PROBE_DATA ((void *)0x1000) + /*enumerator register functions */ static odpdrv_enumr_t enumr1_register(void) { @@ -77,7 +79,8 @@ static odpdrv_enumr_t enumr1_register(void) .api_version = 1, .probe = enumr1_probe, .remove = enumr1_remove, - .register_notifier = NULL + .register_notifier = NULL, + .enumr_data = ENUMR1_PROBE_DATA }; return odpdrv_enumr_register(&param); @@ -91,7 +94,8 @@ static odpdrv_enumr_t enumr2_register(void) .api_version = 1, .probe = enumr2_probe, .remove = enumr2_remove, - .register_notifier = NULL + .register_notifier = NULL, + .enumr_data = NULL }; return odpdrv_enumr_register(&param); @@ -105,7 +109,8 @@ static odpdrv_enumr_t enumr3_register(void) .api_version = 1, .probe = enumr3_probe, .remove = enumr3_remove, - .register_notifier = NULL + .register_notifier = NULL, + .enumr_data = NULL }; return odpdrv_enumr_register(&param); @@ -119,7 +124,8 @@ static odpdrv_enumr_t enumr4_register(void) .api_version = 1, .probe = enumr4_probe, .remove = enumr4_remove, - .register_notifier = NULL + .register_notifier = NULL, + .enumr_data = NULL }; return odpdrv_enumr_register(&param); @@ -133,57 +139,61 @@ static odpdrv_enumr_t enumr_invalid_register(void) .api_version = 1, .probe = enumr4_probe, .remove = enumr4_remove, - .register_notifier = NULL + .register_notifier = NULL, + .enumr_data = NULL }; return odpdrv_enumr_register(&param); } /*enumerator probe functions, just making sure they have been run: */ -static int enumr1_probe(void) +static int enumr1_probe(void *data) { + CU_ASSERT(data == ENUMR1_PROBE_DATA); enumr1_probed = 1; return 0; } -static int enumr2_probe(void) +#define UNUSED __attribute__((__unused__)) + +static int enumr2_probe(void *data UNUSED) { enumr2_probed = 1; return 0; } -static int enumr3_probe(void) +static int enumr3_probe(void *data UNUSED) { enumr3_probed = 1; return 0; } -static int enumr4_probe(void) +static int enumr4_probe(void *data UNUSED) { enumr4_probed = 1; return 0; } /*enumerator remove functions, just making sure they have been run: */ -static int enumr1_remove(void) +static int enumr1_remove(void *data UNUSED) { enumr1_probed = -1; return 0; } -static int enumr2_remove(void) +static int enumr2_remove(void *data UNUSED) { enumr2_probed = -1; return 0; } -static int enumr3_remove(void) +static int enumr3_remove(void *data UNUSED) { enumr3_probed = -1; return 0; } -static int enumr4_remove(void) +static int enumr4_remove(void *data UNUSED) { enumr4_probed = -1; return 0; ----------------------------------------------------------------------- Summary of changes: example/ddf_ifs/ddf_ifs_enumr_dpdk.c | 4 +- example/ddf_ifs/ddf_ifs_enumr_generic.c | 4 +- include/odp/drv/spec/driver.h | 10 ++- platform/linux-dpdk/Makefile.am | 3 + platform/linux-dpdk/pktio/dpdk.c | 57 ++++++--------- platform/linux-generic/Makefile.am | 3 + platform/linux-generic/drv_driver.c | 4 +- .../linux-generic/include/odp_packet_io_internal.h | 4 +- .../{odp/drv/hints.h => odp_packet_io_pool.h} | 19 ++--- .../include/odp_packet_io_pool_access.h | 58 +++++++++++++++ .../include/odp_pktio_ops_subsystem.h | 8 +-- platform/linux-generic/odp_packet_io.c | 9 +++ platform/linux-generic/odp_packet_io_pool.c | 55 ++++++++++++++ platform/linux-generic/pktio/dpdk.c | 75 ++++++++----------- platform/linux-generic/pktio/ipc.c | 41 +++++++---- platform/linux-generic/pktio/loopback.c | 40 +++++++---- platform/linux-generic/pktio/netmap.c | 83 ++++++++++------------ platform/linux-generic/pktio/pcap.c | 26 ++++--- platform/linux-generic/pktio/socket.c | 58 +++++++-------- platform/linux-generic/pktio/socket_mmap.c | 58 +++++++-------- platform/linux-generic/pktio/tap.c | 46 +++++++----- test/validation/drv/drvdriver/drvdriver_device.c | 11 +-- test/validation/drv/drvdriver/drvdriver_driver.c | 18 ++--- test/validation/drv/drvdriver/drvdriver_enumr.c | 52 ++++++++------ 24 files changed, 451 insertions(+), 295 deletions(-) copy platform/linux-generic/include/{odp/drv/hints.h => odp_packet_io_pool.h} (51%) create mode 100644 platform/linux-generic/include/odp_packet_io_pool_access.h create mode 100644 platform/linux-generic/odp_packet_io_pool.c hooks/post-receive --

8 years, 2 months

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp