From: Rakesh Kudurumalla <rkudurumalla@marvell.com>
To: <jerinj@marvell.com>, Nithin Dabilpuram <ndabilpuram@marvell.com>,
"Kiran Kumar K" <kirankumark@marvell.com>,
Sunil Kumar Kori <skori@marvell.com>,
Satha Rao <skoteshwar@marvell.com>, Ray Kinsella <mdr@ashroe.eu>
Cc: <dev@dpdk.org>, Rakesh Kudurumalla <rkudurumalla@marvell.com>
Subject: [dpdk-dev] [PATCH 1/2] common/cnxk: change policer timeuint to configured value
Date: Tue, 2 Nov 2021 11:28:01 +0530 [thread overview]
Message-ID: <20211102055802.1801583-1-rkudurumalla@marvell.com> (raw)
Ingress meter rate is calculated based on hardcoded
policer timeunit. Patch adds mbox interface to
retrieve configured policer timeunit
Signed-off-by: Rakesh Kudurumalla <rkudurumalla@marvell.com>
---
drivers/common/cnxk/hw/nix.h | 12 ++---
drivers/common/cnxk/roc_mbox.h | 31 +++++++++++++
drivers/common/cnxk/roc_nix.h | 4 ++
drivers/common/cnxk/roc_nix_bpf.c | 76 +++++++++++++++++++++++--------
drivers/common/cnxk/roc_npc.c | 1 +
drivers/common/cnxk/version.map | 1 +
6 files changed, 99 insertions(+), 26 deletions(-)
diff --git a/drivers/common/cnxk/hw/nix.h b/drivers/common/cnxk/hw/nix.h
index b9e65c942f..dd2ebecc6a 100644
--- a/drivers/common/cnxk/hw/nix.h
+++ b/drivers/common/cnxk/hw/nix.h
@@ -2115,10 +2115,10 @@ struct nix_lso_format {
/** NIX policer rate limits */
#define NIX_BPF_MAX_RATE_DIV_EXP 12
-#define NIX_BPF_MAX_RATE_EXPONENT 0xf
+#define NIX_BPF_MAX_RATE_EXPONENT 0x16
#define NIX_BPF_MAX_RATE_MANTISSA 0xff
-#define NIX_BPF_RATE_CONST 2000000ULL
+#define NIX_BPF_RATE_CONST 8000000000ULL
/* NIX rate calculation in Bits/Sec
* PIR_ADD = ((256 + NIX_*_PIR[RATE_MANTISSA])
@@ -2129,14 +2129,14 @@ struct nix_lso_format {
* << NIX_*_CIR[RATE_EXPONENT]) / 256
* CIR = (2E6 * CIR_ADD / (CCLK_TICKS << NIX_*_CIR[RATE_DIVIDER_EXPONENT]))
*/
-#define NIX_BPF_RATE(exponent, mantissa, div_exp) \
+#define NIX_BPF_RATE(policer_timeunit, exponent, mantissa, div_exp) \
((NIX_BPF_RATE_CONST * ((256 + (mantissa)) << (exponent))) / \
- (((1ull << (div_exp)) * 256)))
+ (((1ull << (div_exp)) * 256 * policer_timeunit)))
/* Meter rate limits in Bits/Sec */
-#define NIX_BPF_RATE_MIN NIX_BPF_RATE(0, 0, NIX_BPF_MAX_RATE_DIV_EXP)
+#define NIX_BPF_RATE_MIN NIX_BPF_RATE(1000000000, 0, 0, 0)
#define NIX_BPF_RATE_MAX \
- NIX_BPF_RATE(NIX_BPF_MAX_RATE_EXPONENT, NIX_BPF_MAX_RATE_MANTISSA, 0)
+ NIX_BPF_RATE(1, NIX_BPF_MAX_RATE_EXPONENT, NIX_BPF_MAX_RATE_MANTISSA, 0)
#define NIX_BPF_DEFAULT_ADJUST_MANTISSA 511
#define NIX_BPF_DEFAULT_ADJUST_EXPONENT 0
diff --git a/drivers/common/cnxk/roc_mbox.h b/drivers/common/cnxk/roc_mbox.h
index 22f6ebcd92..b63fe108c9 100644
--- a/drivers/common/cnxk/roc_mbox.h
+++ b/drivers/common/cnxk/roc_mbox.h
@@ -131,6 +131,8 @@ struct mbox_msghdr {
M(TIM_ENABLE_RING, 0x803, tim_enable_ring, tim_ring_req, \
tim_enable_rsp) \
M(TIM_DISABLE_RING, 0x804, tim_disable_ring, tim_ring_req, msg_rsp) \
+ M(TIM_GET_MIN_INTVL, 0x805, tim_get_min_intvl, tim_intvl_req, \
+ tim_intvl_rsp) \
/* CPT mbox IDs (range 0xA00 - 0xBFF) */ \
M(CPT_LF_ALLOC, 0xA00, cpt_lf_alloc, cpt_lf_alloc_req_msg, msg_rsp) \
M(CPT_LF_FREE, 0xA01, cpt_lf_free, msg_req, msg_rsp) \
@@ -143,6 +145,7 @@ struct mbox_msghdr {
M(CPT_STATS, 0xA05, cpt_sts_get, cpt_sts_req, cpt_sts_rsp) \
M(CPT_RXC_TIME_CFG, 0xA06, cpt_rxc_time_cfg, cpt_rxc_time_cfg_req, \
msg_rsp) \
+ M(CPT_CTX_CACHE_SYNC, 0xA07, cpt_ctx_cache_sync, msg_req, msg_rsp) \
M(CPT_RX_INLINE_LF_CFG, 0xBFE, cpt_rx_inline_lf_cfg, \
cpt_rx_inline_lf_cfg_msg, msg_rsp) \
M(CPT_GET_CAPS, 0xBFD, cpt_caps_get, msg_req, cpt_caps_rsp_msg) \
@@ -238,6 +241,12 @@ struct mbox_msghdr {
M(NIX_BANDPROF_ALLOC, 0x801d, nix_bandprof_alloc, \
nix_bandprof_alloc_req, nix_bandprof_alloc_rsp) \
M(NIX_BANDPROF_FREE, 0x801e, nix_bandprof_free, nix_bandprof_free_req, \
+ msg_rsp) \
+ M(NIX_BANDPROF_GET_HWINFO, 0x801f, nix_bandprof_get_hwinfo, msg_req, \
+ nix_bandprof_get_hwinfo_rsp) \
+ M(NIX_CPT_BP_ENABLE, 0x8020, nix_cpt_bp_enable, nix_bp_cfg_req, \
+ nix_bp_cfg_rsp) \
+ M(NIX_CPT_BP_DISABLE, 0x8021, nix_cpt_bp_disable, nix_bp_cfg_req, \
msg_rsp)
/* Messages initiated by AF (range 0xC00 - 0xDFF) */
@@ -1070,6 +1079,7 @@ struct nix_rx_cfg {
struct mbox_msghdr hdr;
#define NIX_RX_OL3_VERIFY BIT(0)
#define NIX_RX_OL4_VERIFY BIT(1)
+#define NIX_RX_DROP_RE BIT(2)
uint8_t __io len_verify; /* Outer L3/L4 len check */
#define NIX_RX_CSUM_OL4_VERIFY BIT(0)
uint8_t __io csum_verify; /* Outer L4 checksum verification */
@@ -1172,6 +1182,12 @@ struct nix_bandprof_free_req {
uint16_t __io prof_idx[NIX_RX_BAND_PROF_LAYER_MAX][BANDPROF_PER_PFFUNC];
};
+struct nix_bandprof_get_hwinfo_rsp {
+ struct mbox_msghdr hdr;
+ uint16_t __io prof_count[NIX_RX_BAND_PROF_LAYER_MAX];
+ uint32_t __io policer_timeunit;
+};
+
/* SSO mailbox error codes
* Range 501 - 600.
*/
@@ -1798,6 +1814,9 @@ struct tim_config_req {
uint32_t __io chunksize;
uint32_t __io interval;
uint8_t __io gpioedge;
+ uint8_t __io rsvd[7];
+ uint64_t __io intervalns;
+ uint64_t __io clockfreq;
};
struct tim_lf_alloc_rsp {
@@ -1811,6 +1830,18 @@ struct tim_enable_rsp {
uint32_t __io currentbucket;
};
+struct tim_intvl_req {
+ struct mbox_msghdr hdr;
+ uint8_t __io clocksource;
+ uint64_t __io clockfreq;
+};
+
+struct tim_intvl_rsp {
+ struct mbox_msghdr hdr;
+ uint64_t __io intvl_cyc;
+ uint64_t __io intvl_ns;
+};
+
struct sdp_node_info {
/* Node to which this PF belons to */
uint8_t __io node_id;
diff --git a/drivers/common/cnxk/roc_nix.h b/drivers/common/cnxk/roc_nix.h
index 343bb2f8b7..4d68a03aa2 100644
--- a/drivers/common/cnxk/roc_nix.h
+++ b/drivers/common/cnxk/roc_nix.h
@@ -11,6 +11,7 @@
#define ROC_NIX_BPF_LEVEL_IDX_INVALID 0xFF
#define ROC_NIX_BPF_LEVEL_MAX 3
#define ROC_NIX_BPF_STATS_MAX 12
+#define ROC_NIX_MTR_ID_INVALID UINT32_MAX
enum roc_nix_rss_reta_sz {
ROC_NIX_RSS_RETA_SZ_64 = 64,
@@ -618,6 +619,9 @@ bool __roc_api roc_nix_tm_is_user_hierarchy_enabled(struct roc_nix *nix);
int __roc_api roc_nix_tm_tree_type_get(struct roc_nix *nix);
/* Ingress Policer API */
+int __roc_api roc_nix_bpf_timeunit_get(struct roc_nix *roc_nix,
+ uint32_t *time_unit);
+
int __roc_api
roc_nix_bpf_count_get(struct roc_nix *roc_nix, uint8_t lvl_mask,
uint16_t count[ROC_NIX_BPF_LEVEL_MAX] /* Out */);
diff --git a/drivers/common/cnxk/roc_nix_bpf.c b/drivers/common/cnxk/roc_nix_bpf.c
index df57958683..6996a54be0 100644
--- a/drivers/common/cnxk/roc_nix_bpf.c
+++ b/drivers/common/cnxk/roc_nix_bpf.c
@@ -35,15 +35,16 @@ get_mbox(struct roc_nix *roc_nix)
static inline uint64_t
meter_rate_to_nix(uint64_t value, uint64_t *exponent_p, uint64_t *mantissa_p,
- uint64_t *div_exp_p)
+ uint64_t *div_exp_p, uint32_t timeunit_p)
{
uint64_t div_exp, exponent, mantissa;
+ uint32_t time_us = timeunit_p;
/* Boundary checks */
if (value < NIX_BPF_RATE_MIN || value > NIX_BPF_RATE_MAX)
return 0;
- if (value <= NIX_BPF_RATE(0, 0, 0)) {
+ if (value <= NIX_BPF_RATE(time_us, 0, 0, 0)) {
/* Calculate rate div_exp and mantissa using
* the following formula:
*
@@ -93,7 +94,7 @@ meter_rate_to_nix(uint64_t value, uint64_t *exponent_p, uint64_t *mantissa_p,
*mantissa_p = mantissa;
/* Calculate real rate value */
- return NIX_BPF_RATE(exponent, mantissa, div_exp);
+ return NIX_BPF_RATE(time_us, exponent, mantissa, div_exp);
}
static inline uint64_t
@@ -337,14 +338,41 @@ roc_nix_bpf_stats_to_idx(enum roc_nix_bpf_stats level_f)
return idx;
}
+int
+roc_nix_bpf_timeunit_get(struct roc_nix *roc_nix, uint32_t *time_unit)
+{
+ struct nix_bandprof_get_hwinfo_rsp *rsp;
+ struct mbox *mbox = get_mbox(roc_nix);
+ struct msg_req *req;
+ int rc = -ENOSPC;
+
+ if (roc_model_is_cn9k())
+ return NIX_ERR_HW_NOTSUP;
+
+ req = mbox_alloc_msg_nix_bandprof_get_hwinfo(mbox);
+ if (req == NULL)
+ goto exit;
+
+ rc = mbox_process_msg(mbox, (void *)&rsp);
+ if (rc)
+ goto exit;
+
+ *time_unit = rsp->policer_timeunit;
+
+exit:
+ return rc;
+}
+
int
roc_nix_bpf_count_get(struct roc_nix *roc_nix, uint8_t lvl_mask,
uint16_t count[ROC_NIX_BPF_LEVEL_MAX])
{
uint8_t mask = lvl_mask & NIX_BPF_LEVEL_F_MASK;
+ struct nix_bandprof_get_hwinfo_rsp *rsp;
+ struct mbox *mbox = get_mbox(roc_nix);
uint8_t leaf_idx, mid_idx, top_idx;
-
- PLT_SET_USED(roc_nix);
+ struct msg_req *req;
+ int rc = -ENOSPC;
if (roc_model_is_cn9k())
return NIX_ERR_HW_NOTSUP;
@@ -352,27 +380,29 @@ roc_nix_bpf_count_get(struct roc_nix *roc_nix, uint8_t lvl_mask,
if (!mask)
return NIX_ERR_PARAM;
- /* Currently No MBOX interface is available to get number
- * of bandwidth profiles. So numbers per level are hard coded,
- * considering 3 RPM blocks and each block has 4 LMAC's.
- * So total 12 physical interfaces are in system. Each interface
- * supports following bandwidth profiles.
- */
+ req = mbox_alloc_msg_nix_bandprof_get_hwinfo(mbox);
+ if (req == NULL)
+ goto exit;
+
+ rc = mbox_process_msg(mbox, (void *)&rsp);
+ if (rc)
+ goto exit;
leaf_idx = roc_nix_bpf_level_to_idx(mask & ROC_NIX_BPF_LEVEL_F_LEAF);
mid_idx = roc_nix_bpf_level_to_idx(mask & ROC_NIX_BPF_LEVEL_F_MID);
top_idx = roc_nix_bpf_level_to_idx(mask & ROC_NIX_BPF_LEVEL_F_TOP);
if (leaf_idx != ROC_NIX_BPF_LEVEL_IDX_INVALID)
- count[leaf_idx] = NIX_MAX_BPF_COUNT_LEAF_LAYER;
+ count[leaf_idx] = rsp->prof_count[sw_to_hw_lvl_map[leaf_idx]];
if (mid_idx != ROC_NIX_BPF_LEVEL_IDX_INVALID)
- count[mid_idx] = NIX_MAX_BPF_COUNT_MID_LAYER;
+ count[mid_idx] = rsp->prof_count[sw_to_hw_lvl_map[mid_idx]];
if (top_idx != ROC_NIX_BPF_LEVEL_IDX_INVALID)
- count[top_idx] = NIX_MAX_BPF_COUNT_TOP_LAYER;
+ count[top_idx] = rsp->prof_count[sw_to_hw_lvl_map[top_idx]];
- return 0;
+exit:
+ return rc;
}
int
@@ -514,7 +544,9 @@ roc_nix_bpf_config(struct roc_nix *roc_nix, uint16_t id,
uint64_t exponent_p = 0, mantissa_p = 0, div_exp_p = 0;
struct mbox *mbox = get_mbox(roc_nix);
struct nix_cn10k_aq_enq_req *aq;
+ uint32_t policer_timeunit;
uint8_t level_idx;
+ int rc;
if (roc_model_is_cn9k())
return NIX_ERR_HW_NOTSUP;
@@ -522,6 +554,10 @@ roc_nix_bpf_config(struct roc_nix *roc_nix, uint16_t id,
if (!cfg)
return NIX_ERR_PARAM;
+ rc = roc_nix_bpf_timeunit_get(roc_nix, &policer_timeunit);
+ if (rc)
+ return rc;
+
level_idx = roc_nix_bpf_level_to_idx(lvl_flag);
if (level_idx == ROC_NIX_BPF_LEVEL_IDX_INVALID)
return NIX_ERR_PARAM;
@@ -544,7 +580,7 @@ roc_nix_bpf_config(struct roc_nix *roc_nix, uint16_t id,
switch (cfg->alg) {
case ROC_NIX_BPF_ALGO_2697:
meter_rate_to_nix(cfg->algo2697.cir, &exponent_p, &mantissa_p,
- &div_exp_p);
+ &div_exp_p, policer_timeunit);
aq->prof.cir_mantissa = mantissa_p;
aq->prof.cir_exponent = exponent_p;
@@ -566,12 +602,12 @@ roc_nix_bpf_config(struct roc_nix *roc_nix, uint16_t id,
case ROC_NIX_BPF_ALGO_2698:
meter_rate_to_nix(cfg->algo2698.cir, &exponent_p, &mantissa_p,
- &div_exp_p);
+ &div_exp_p, policer_timeunit);
aq->prof.cir_mantissa = mantissa_p;
aq->prof.cir_exponent = exponent_p;
meter_rate_to_nix(cfg->algo2698.pir, &exponent_p, &mantissa_p,
- &div_exp_p);
+ &div_exp_p, policer_timeunit);
aq->prof.peir_mantissa = mantissa_p;
aq->prof.peir_exponent = exponent_p;
@@ -595,12 +631,12 @@ roc_nix_bpf_config(struct roc_nix *roc_nix, uint16_t id,
case ROC_NIX_BPF_ALGO_4115:
meter_rate_to_nix(cfg->algo4115.cir, &exponent_p, &mantissa_p,
- &div_exp_p);
+ &div_exp_p, policer_timeunit);
aq->prof.cir_mantissa = mantissa_p;
aq->prof.cir_exponent = exponent_p;
meter_rate_to_nix(cfg->algo4115.eir, &exponent_p, &mantissa_p,
- &div_exp_p);
+ &div_exp_p, policer_timeunit);
aq->prof.peir_mantissa = mantissa_p;
aq->prof.peir_exponent = exponent_p;
diff --git a/drivers/common/cnxk/roc_npc.c b/drivers/common/cnxk/roc_npc.c
index 0a7966b52e..503c74748f 100644
--- a/drivers/common/cnxk/roc_npc.c
+++ b/drivers/common/cnxk/roc_npc.c
@@ -307,6 +307,7 @@ npc_parse_actions(struct roc_npc *roc_npc, const struct roc_npc_attr *attr,
/* Initialize actions */
flow->ctr_id = NPC_COUNTER_NONE;
+ flow->mtr_id = ROC_NIX_MTR_ID_INVALID;
pf_func = npc->pf_func;
for (; actions->type != ROC_NPC_ACTION_TYPE_END; actions++) {
diff --git a/drivers/common/cnxk/version.map b/drivers/common/cnxk/version.map
index bf47b33b3e..1f97fad89f 100644
--- a/drivers/common/cnxk/version.map
+++ b/drivers/common/cnxk/version.map
@@ -97,6 +97,7 @@ INTERNAL {
roc_nix_bpf_stats_read;
roc_nix_bpf_stats_reset;
roc_nix_bpf_stats_to_idx;
+ roc_nix_bpf_timeunit_get;
roc_nix_cq_dump;
roc_nix_cq_fini;
roc_nix_cq_init;
--
2.25.1
next reply other threads:[~2021-11-02 5:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-02 5:58 Rakesh Kudurumalla [this message]
2021-11-02 5:58 ` [dpdk-dev] [PATCH 2/2] net/cnxk: integrate bpfcount get MBOX interface Rakesh Kudurumalla
2021-11-03 15:19 ` Jerin Jacob
2021-11-02 6:41 ` [dpdk-dev] [PATCH v2 1/2] common/cnxk: change policer timeuint to configured value Rakesh Kudurumalla
2021-11-02 6:41 ` [dpdk-dev] [PATCH v2 2/2] net/cnxk: integrate bpfcount get MBOX interface Rakesh Kudurumalla
2021-11-03 15:16 ` [dpdk-dev] [PATCH v2 1/2] common/cnxk: change policer timeuint to configured value Jerin Jacob
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211102055802.1801583-1-rkudurumalla@marvell.com \
--to=rkudurumalla@marvell.com \
--cc=dev@dpdk.org \
--cc=jerinj@marvell.com \
--cc=kirankumark@marvell.com \
--cc=mdr@ashroe.eu \
--cc=ndabilpuram@marvell.com \
--cc=skori@marvell.com \
--cc=skoteshwar@marvell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).