On Tue, Apr 13, 2021 at 12:54 AM Dumitrescu, Cristian
<cristian.dumitre...@intel.com> wrote:
>
>
>
> > -----Original Message-----
> > From: Li Zhang <l...@nvidia.com>
> > Sent: Saturday, April 10, 2021 8:25 AM
> > To: dek...@nvidia.com; or...@nvidia.com; viachesl...@nvidia.com;
> > ma...@nvidia.com; shah...@nvidia.com; Dumitrescu, Cristian
> > <cristian.dumitre...@intel.com>; lir...@marvell.com; Thomas Monjalon
> > <tho...@monjalon.net>; Yigit, Ferruh <ferruh.yi...@intel.com>; Andrew
> > Rybchenko <andrew.rybche...@oktetlabs.ru>
> > Cc: dev@dpdk.org; rasl...@nvidia.com; ron...@nvidia.com
> > Subject: [PATCH v3 1/4] ethdev: add packet mode in meter profile structure
> >
> > Currently meter algorithms only supports rate is bytes per second(BPS).
> > Add packet_mode flag in meter profile parameters data structure.
> > So that it can meter traffic by packet per second.
> >
> > When packet_mode is 0, the profile rates and bucket sizes are
> > specified in bytes per second and bytes
> > when packet_mode is not 0, the profile rates and bucket sizes are
> > specified in packets and packets per second.
> >
> > The below structure will be extended:
> > rte_mtr_meter_profile
> > rte_mtr_capabilities
> >
> > Signed-off-by: Li Zhang <l...@nvidia.com>
> > Acked-by: Matan Azrad <ma...@nvidia.com>
Acked-by: Jerin Jacob <jer...@marvell.com>
> > ---
> > doc/guides/rel_notes/release_21_05.rst | 12 ++++
> > lib/librte_ethdev/rte_mtr.h | 90 ++++++++++++++++++++++----
> > 2 files changed, 91 insertions(+), 11 deletions(-)
> >
> > diff --git a/doc/guides/rel_notes/release_21_05.rst
> > b/doc/guides/rel_notes/release_21_05.rst
> > index f199ad286d..b4653d63a1 100644
> > --- a/doc/guides/rel_notes/release_21_05.rst
> > +++ b/doc/guides/rel_notes/release_21_05.rst
> > @@ -152,6 +152,18 @@ New Features
> > * ethdev: Added RTE_FLOW_ACTION_TYPE_METER_COLOR in enum
> > rte_flow_action_type.
> > * ethdev: Added RTE_MTR_ERROR_TYPE_METER_POLICY_ID and
> > RTE_MTR_ERROR_TYPE_METER_POLICY_ID into rte_mtr_error_type.
> >
> > +* **Added support for meter PPS profile.**
> > +
> > + Currently meter algorithms only supports bytes per second(BPS).
> > + Add packet_mode in the meter profile parameters data structures
> > + to support packet per second (PPS) mode.
> > + So that it can meter traffic by packet per second.
> > + Packet_mode must be 0 when it is bytes mode.
> > +
> > +* **Updated MLX5 driver.**
> > +
> > + * Added support for meter profile packet per second mode
> > (packet_mode).
> > +
> > Removed Items
> > -------------
> >
> > diff --git a/lib/librte_ethdev/rte_mtr.h b/lib/librte_ethdev/rte_mtr.h
> > index 4938ef065f..778fad7638 100644
> > --- a/lib/librte_ethdev/rte_mtr.h
> > +++ b/lib/librte_ethdev/rte_mtr.h
> > @@ -133,46 +133,71 @@ struct rte_mtr_meter_profile {
> > union {
> > /** Items only valid when *alg* is set to srTCM - RFC 2697. */
> > struct {
> > - /** Committed Information Rate (CIR)
> > (bytes/second). */
> > + /**
> > + * Committed Information Rate (CIR)
> > + * (bytes per second or packets per second).
> > + */
> > uint64_t cir;
> >
> > - /** Committed Burst Size (CBS) (bytes). */
> > + /** Committed Burst Size (CBS) (bytes or packets). */
> > uint64_t cbs;
> >
> > - /** Excess Burst Size (EBS) (bytes). */
> > + /** Excess Burst Size (EBS) (bytes or packets). */
> > uint64_t ebs;
> > } srtcm_rfc2697;
> >
> > /** Items only valid when *alg* is set to trTCM - RFC 2698. */
> > struct {
> > - /** Committed Information Rate (CIR)
> > (bytes/second). */
> > + /**
> > + * Committed Information Rate (CIR)
> > + * (bytes per second or packets per second).
> > + */
> > uint64_t cir;
> >
> > - /** Peak Information Rate (PIR) (bytes/second). */
> > + /**
> > + * Peak Information Rate (PIR)
> > + * (bytes per second or packets per second).
> > + */
> > uint64_t pir;
> >
> > - /** Committed Burst Size (CBS) (byes). */
> > + /** Committed Burst Size (CBS) (bytes or packets). */
> > uint64_t cbs;
> >
> > - /** Peak Burst Size (PBS) (bytes). */
> > + /** Peak Burst Size (PBS) (bytes or packets). */
> > uint64_t pbs;
> > } trtcm_rfc2698;
> >
> > /** Items only valid when *alg* is set to trTCM - RFC 4115. */
> > struct {
> > - /** Committed Information Rate (CIR)
> > (bytes/second). */
> > + /**
> > + * Committed Information Rate (CIR)
> > + * (bytes per second or packets per second).
> > + */
> > uint64_t cir;
> >
> > - /** Excess Information Rate (EIR) (bytes/second). */
> > + /**
> > + * Excess Information Rate (EIR)
> > + * (bytes per second or packets per second).
> > + */
> > uint64_t eir;
> >
> > - /** Committed Burst Size (CBS) (byes). */
> > + /** Committed Burst Size (CBS) (bytes or packets). */
> > uint64_t cbs;
> >
> > - /** Excess Burst Size (EBS) (bytes). */
> > + /** Excess Burst Size (EBS) (bytes or packets). */
> > uint64_t ebs;
> > } trtcm_rfc4115;
> > };
> > +
> > + /**
> > + * When zero, the byte mode is enabled for the current profile, so
> > the
> > + * *rate* and *size* fields are specified in bytes per second
> > + * and bytes, respectively.
> > + * When non-zero, the packet mode is enabled for the current
> > profile,
> > + * so the *rate* and *size* fields are specified in packets per second
> > + * and packets, respectively.
> > + */
> > + int packet_mode;
> > };
> >
> > /**
> > @@ -346,6 +371,48 @@ struct rte_mtr_capabilities {
> > */
> > int color_aware_trtcm_rfc4115_supported;
> >
> > + /**
> > + * srTCM rfc2697 byte mode supported.
> > + * When non-zero, it indicates that byte mode is supported for
> > + * the srTCM RFC 2697 metering algorithm.
> > + */
> > + int srtcm_rfc2697_byte_mode_supported;
> > +
> > + /**
> > + * srTCM rfc2697 packet mode supported.
> > + * When non-zero, it indicates that packet mode is supported for
> > + * the srTCM RFC 2697 metering algorithm.
> > + */
> > + int srtcm_rfc2697_packet_mode_supported;
> > +
> > + /**
> > + * trTCM rfc2698 byte mode supported.
> > + * When non-zero, it indicates that byte mode is supported for
> > + * the trTCM RFC 2698 metering algorithm.
> > + */
> > + int trtcm_rfc2698_byte_mode_supported;
> > +
> > + /**
> > + * trTCM rfc2698 packet mode supported.
> > + * When non-zero, it indicates that packet mode is supported for
> > + * the trTCM RFC 2698 metering algorithm.
> > + */
> > + int trtcm_rfc2698_packet_mode_supported;
> > +
> > + /**
> > + * trTCM rfc4115 byte mode supported.
> > + * When non-zero, it indicates that byte mode is supported for
> > + * the trTCM RFC 4115 metering algorithm.
> > + */
> > + int trtcm_rfc4115_byte_mode_supported;
> > +
> > + /**
> > + * trTCM rfc4115 packet mode supported.
> > + * When non-zero, it indicates that packet mode is supported for
> > + * the trTCM RFC 4115 metering algorithm.
> > + */
> > + int trtcm_rfc4115_packet_mode_supported;
> > +
> > /** Set of supported statistics counter types.
> > * @see enum rte_mtr_stats_type
> > */
> > @@ -363,6 +430,7 @@ enum rte_mtr_error_type {
> > RTE_MTR_ERROR_TYPE_UNSPECIFIED, /**< Cause unspecified. */
> > RTE_MTR_ERROR_TYPE_METER_PROFILE_ID,
> > RTE_MTR_ERROR_TYPE_METER_PROFILE,
> > + RTE_MTR_ERROR_TYPE_METER_PROFILE_PACKET_MODE,
> > RTE_MTR_ERROR_TYPE_MTR_ID,
> > RTE_MTR_ERROR_TYPE_MTR_PARAMS,
> > RTE_MTR_ERROR_TYPE_POLICER_ACTION_GREEN,
> > --
> > 2.21.0
>
> Acked-by: Cristian Dumitrescu <cristian.dumitre...@intel.com>
>
