From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 3E31A1B4A8 for ; Fri, 4 Jan 2019 14:59:45 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9E2B2C07015A; Fri, 4 Jan 2019 13:59:44 +0000 (UTC) Received: from localhost.localdomain (ovpn-117-29.ams2.redhat.com [10.36.117.29]) by smtp.corp.redhat.com (Postfix) with ESMTP id C70295D6A9; Fri, 4 Jan 2019 13:59:43 +0000 (UTC) From: Eelco Chaudron To: cristian.dumitrescu@intel.com Cc: dev@dpdk.org Date: Fri, 4 Jan 2019 13:59:42 +0000 Message-Id: <154661038141.75321.10886021990395716851.stgit@dbuild> In-Reply-To: <154661036216.75321.4852909033090962683.stgit@dbuild> References: <154661036216.75321.4852909033090962683.stgit@dbuild> User-Agent: StGit/unknown-version MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 04 Jan 2019 13:59:44 +0000 (UTC) Subject: [dpdk-dev] [PATCH v4 1/2] lib/librte_meter: add RFC4115 trTCM meter support X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jan 2019 13:59:45 -0000 This patch adds support for RFC4115 trTCM meters. Signed-off-by: Eelco Chaudron --- lib/librte_meter/rte_meter.c | 42 ++++++ lib/librte_meter/rte_meter.h | 233 ++++++++++++++++++++++++++++++++ lib/librte_meter/rte_meter_version.map | 9 + 3 files changed, 282 insertions(+), 2 deletions(-) diff --git a/lib/librte_meter/rte_meter.c b/lib/librte_meter/rte_meter.c index 473f69aba..e55f9be65 100644 --- a/lib/librte_meter/rte_meter.c +++ b/lib/librte_meter/rte_meter.c @@ -110,3 +110,45 @@ rte_meter_trtcm_config(struct rte_meter_trtcm *m, return 0; } + +int __rte_experimental +rte_meter_trtcm_rfc4115_profile_config( + struct rte_meter_trtcm_rfc4115_profile *p, + struct rte_meter_trtcm_rfc4115_params *params) +{ + uint64_t hz = rte_get_tsc_hz(); + + /* Check input parameters */ + if ((p == NULL) || + (params == NULL) || + (params->cir != 0 && params->cbs == 0) || + (params->eir != 0 && params->ebs == 0)) + return -EINVAL; + + /* Initialize trTCM run-time structure */ + p->cbs = params->cbs; + p->ebs = params->ebs; + rte_meter_get_tb_params(hz, params->cir, &p->cir_period, + &p->cir_bytes_per_period); + rte_meter_get_tb_params(hz, params->eir, &p->eir_period, + &p->eir_bytes_per_period); + + return 0; +} + +int __rte_experimental +rte_meter_trtcm_rfc4115_config( + struct rte_meter_trtcm_rfc4115 *m, + struct rte_meter_trtcm_rfc4115_profile *p) +{ + /* Check input parameters */ + if ((m == NULL) || (p == NULL)) + return -EINVAL; + + /* Initialize trTCM run-time structure */ + m->time_tc = m->time_te = rte_get_tsc_cycles(); + m->tc = p->cbs; + m->te = p->ebs; + + return 0; +} diff --git a/lib/librte_meter/rte_meter.h b/lib/librte_meter/rte_meter.h index 58a051583..c7eee896a 100644 --- a/lib/librte_meter/rte_meter.h +++ b/lib/librte_meter/rte_meter.h @@ -1,3 +1,4 @@ + /* SPDX-License-Identifier: BSD-3-Clause * Copyright(c) 2010-2014 Intel Corporation */ @@ -16,6 +17,7 @@ extern "C" { * Traffic metering algorithms: * 1. Single Rate Three Color Marker (srTCM): defined by IETF RFC 2697 * 2. Two Rate Three Color Marker (trTCM): defined by IETF RFC 2698 + * 3. Two Rate Three Color Marker (trTCM): defined by IETF RFC 4115 * ***/ @@ -49,10 +51,21 @@ be greater than or equal to CIR. Both CBS or EBS have to be greater than zero. * struct rte_meter_trtcm_params { uint64_t cir; /**< Committed Information Rate (CIR). Measured in bytes per second. */ uint64_t pir; /**< Peak Information Rate (PIR). Measured in bytes per second. */ - uint64_t cbs; /**< Committed Burst Size (CBS). Measured in byes. */ + uint64_t cbs; /**< Committed Burst Size (CBS). Measured in bytes. */ uint64_t pbs; /**< Peak Burst Size (PBS). Measured in bytes. */ }; +/** trTCM parameters per metered traffic flow. The CIR, EIR, CBS and EBS +parameters only count bytes of IP packets and do not include link specific +headers. The CBS and EBS need to be greater than zero if CIR and EIR are +none-zero respectively.*/ +struct rte_meter_trtcm_rfc4115_params { + uint64_t cir; /**< Committed Information Rate (CIR). Measured in bytes per second. */ + uint64_t eir; /**< Excess Information Rate (EIR). Measured in bytes per second. */ + uint64_t cbs; /**< Committed Burst Size (CBS). Measured in bytes. */ + uint64_t ebs; /**< Excess Burst Size (EBS). Measured in bytes. */ +}; + /** * Internal data structure storing the srTCM configuration profile. Typically * shared by multiple srTCM objects. @@ -65,12 +78,24 @@ struct rte_meter_srtcm_profile; */ struct rte_meter_trtcm_profile; +/** + * Internal data structure storing the trTCM RFC4115 configuration profile. + * Typically shared by multiple trTCM objects. + */ +struct rte_meter_trtcm_rfc4115_profile; + /** Internal data structure storing the srTCM run-time context per metered traffic flow. */ struct rte_meter_srtcm; /** Internal data structure storing the trTCM run-time context per metered traffic flow. */ struct rte_meter_trtcm; +/** + * Internal data structure storing the trTCM RFC4115 run-time context per + * metered traffic flow. + */ +struct rte_meter_trtcm_rfc4115; + /** * srTCM profile configuration * @@ -98,6 +123,23 @@ rte_meter_srtcm_profile_config(struct rte_meter_srtcm_profile *p, int rte_meter_trtcm_profile_config(struct rte_meter_trtcm_profile *p, struct rte_meter_trtcm_params *params); +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice + * + * trTCM RFC 4115 profile configuration + * + * @param p + * Pointer to pre-allocated trTCM profile data structure + * @param params + * trTCM profile parameters + * @return + * 0 upon success, error code otherwise + */ +int __rte_experimental +rte_meter_trtcm_rfc4115_profile_config( + struct rte_meter_trtcm_rfc4115_profile *p, + struct rte_meter_trtcm_rfc4115_params *params); /** * srTCM configuration per metered traffic flow @@ -127,6 +169,23 @@ int rte_meter_trtcm_config(struct rte_meter_trtcm *m, struct rte_meter_trtcm_profile *p); +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice + * + * trTCM RFC 4115 configuration per metered traffic flow + * + * @param m + * Pointer to pre-allocated trTCM data structure + * @param p + * trTCM profile. Needs to be valid. + * @return + * 0 upon success, error code otherwise + */ +int __rte_experimental +rte_meter_trtcm_rfc4115_config(struct rte_meter_trtcm_rfc4115 *m, + struct rte_meter_trtcm_rfc4115_profile *p); + /** * srTCM color blind traffic metering * @@ -213,6 +272,57 @@ rte_meter_trtcm_color_aware_check(struct rte_meter_trtcm *m, uint32_t pkt_len, enum rte_meter_color pkt_color); +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice + * + * trTCM RFC4115 color blind traffic metering + * + * @param m + * Handle to trTCM instance + * @param p + * trTCM profile specified at trTCM object creation time + * @param time + * Current CPU time stamp (measured in CPU cycles) + * @param pkt_len + * Length of the current IP packet (measured in bytes) + * @return + * Color assigned to the current IP packet + */ +static inline enum rte_meter_color __rte_experimental +rte_meter_trtcm_rfc4115_color_blind_check( + struct rte_meter_trtcm_rfc4115 *m, + struct rte_meter_trtcm_rfc4115_profile *p, + uint64_t time, + uint32_t pkt_len); + +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice + * + * trTCM RFC4115 color aware traffic metering + * + * @param m + * Handle to trTCM instance + * @param p + * trTCM profile specified at trTCM object creation time + * @param time + * Current CPU time stamp (measured in CPU cycles) + * @param pkt_len + * Length of the current IP packet (measured in bytes) + * @param pkt_color + * Input color of the current IP packet + * @return + * Color assigned to the current IP packet + */ +static inline enum rte_meter_color __rte_experimental +rte_meter_trtcm_rfc4115_color_aware_check( + struct rte_meter_trtcm_rfc4115 *m, + struct rte_meter_trtcm_rfc4115_profile *p, + uint64_t time, + uint32_t pkt_len, + enum rte_meter_color pkt_color); + /* * Inline implementation of run-time methods * @@ -259,13 +369,43 @@ struct rte_meter_trtcm { uint64_t time_tc; /**< Time of latest update of C token bucket */ uint64_t time_tp; - /**< Time of latest update of E token bucket */ + /**< Time of latest update of P token bucket */ uint64_t tc; /**< Number of bytes currently available in committed(C) token bucket */ uint64_t tp; /**< Number of bytes currently available in the peak(P) token bucket */ }; +struct rte_meter_trtcm_rfc4115_profile { + uint64_t cbs; + /**< Upper limit for C token bucket */ + uint64_t ebs; + /**< Upper limit for E token bucket */ + uint64_t cir_period; + /**< Number of CPU cycles for one update of C token bucket */ + uint64_t cir_bytes_per_period; + /**< Number of bytes to add to C token bucket on each update */ + uint64_t eir_period; + /**< Number of CPU cycles for one update of E token bucket */ + uint64_t eir_bytes_per_period; + /**< Number of bytes to add to E token bucket on each update */ +}; + +/** + * Internal data structure storing the trTCM RFC4115 run-time context per + * metered traffic flow. + */ +struct rte_meter_trtcm_rfc4115 { + uint64_t time_tc; + /**< Time of latest update of C token bucket */ + uint64_t time_te; + /**< Time of latest update of E token bucket */ + uint64_t tc; + /**< Number of bytes currently available in committed(C) token bucket */ + uint64_t te; + /**< Number of bytes currently available in the excess(E) token bucket */ +}; + static inline enum rte_meter_color rte_meter_srtcm_color_blind_check(struct rte_meter_srtcm *m, struct rte_meter_srtcm_profile *p, @@ -434,6 +574,95 @@ rte_meter_trtcm_color_aware_check(struct rte_meter_trtcm *m, return e_RTE_METER_GREEN; } +static inline enum rte_meter_color __rte_experimental +rte_meter_trtcm_rfc4115_color_blind_check( + struct rte_meter_trtcm_rfc4115 *m, + struct rte_meter_trtcm_rfc4115_profile *p, + uint64_t time, + uint32_t pkt_len) +{ + uint64_t time_diff_tc, time_diff_te, n_periods_tc, n_periods_te, tc, te; + + /* Bucket update */ + time_diff_tc = time - m->time_tc; + time_diff_te = time - m->time_te; + n_periods_tc = time_diff_tc / p->cir_period; + n_periods_te = time_diff_te / p->eir_period; + m->time_tc += n_periods_tc * p->cir_period; + m->time_te += n_periods_te * p->eir_period; + + tc = m->tc + n_periods_tc * p->cir_bytes_per_period; + if (tc > p->cbs) + tc = p->cbs; + + te = m->te + n_periods_te * p->eir_bytes_per_period; + if (te > p->ebs) + te = p->ebs; + + /* Color logic */ + if (tc >= pkt_len) { + m->tc = tc - pkt_len; + m->te = te; + return e_RTE_METER_GREEN; + } + if (te >= pkt_len) { + m->tc = tc; + m->te = te - pkt_len; + return e_RTE_METER_YELLOW; + } + + /* If we end up here the color is RED */ + m->tc = tc; + m->te = te; + return e_RTE_METER_RED; +} + +static inline enum rte_meter_color __rte_experimental +rte_meter_trtcm_rfc4115_color_aware_check( + struct rte_meter_trtcm_rfc4115 *m, + struct rte_meter_trtcm_rfc4115_profile *p, + uint64_t time, + uint32_t pkt_len, + enum rte_meter_color pkt_color) +{ + uint64_t time_diff_tc, time_diff_te, n_periods_tc, n_periods_te, tc, te; + + /* Bucket update */ + time_diff_tc = time - m->time_tc; + time_diff_te = time - m->time_te; + n_periods_tc = time_diff_tc / p->cir_period; + n_periods_te = time_diff_te / p->eir_period; + m->time_tc += n_periods_tc * p->cir_period; + m->time_te += n_periods_te * p->eir_period; + + tc = m->tc + n_periods_tc * p->cir_bytes_per_period; + if (tc > p->cbs) + tc = p->cbs; + + te = m->te + n_periods_te * p->eir_bytes_per_period; + if (te > p->ebs) + te = p->ebs; + + /* Color logic */ + if ((pkt_color == e_RTE_METER_GREEN) && (tc >= pkt_len)) { + m->tc = tc - pkt_len; + m->te = te; + return e_RTE_METER_GREEN; + } + + if ((pkt_color != e_RTE_METER_RED) && (te >= pkt_len)) { + m->tc = tc; + m->te = te - pkt_len; + return e_RTE_METER_YELLOW; + } + + /* If we end up here the color is RED */ + m->tc = tc; + m->te = te; + return e_RTE_METER_RED; +} + + #ifdef __cplusplus } #endif diff --git a/lib/librte_meter/rte_meter_version.map b/lib/librte_meter/rte_meter_version.map index cb79f0c2b..4b460d580 100644 --- a/lib/librte_meter/rte_meter_version.map +++ b/lib/librte_meter/rte_meter_version.map @@ -17,3 +17,12 @@ DPDK_18.08 { rte_meter_srtcm_profile_config; rte_meter_trtcm_profile_config; }; + +EXPERIMENTAL { + global: + + rte_meter_trtcm_rfc4115_color_aware_check; + rte_meter_trtcm_rfc4115_color_blind_check; + rte_meter_trtcm_rfc4115_config; + rte_meter_trtcm_rfc4115_profile_config; +};