d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

common/cnxk: handle packet mode shaper limits

Browse Source 
Add new macros to reflect HW shaper PPS limits. New API to validate
input rates for packet mode. Increase adjust value to support lesser
PPS (<61).

Signed-off-by: Satha Rao <skoteshwar@marvell.com>
Acked-by: Nithin Dabilpuram <ndabilpuram@marvell.com>
This commit is contained in:
Satha Rao 2021-09-22 02:11:44 -04:00 committed by Jerin Jacob
parent 6fe49f1097
commit 680078faf3
4 changed files with 60 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/common/cnxk/hw/nix.h
View File

@ -2133,6 +2133,9 @@ struct nix_lso_format {
NIX_TM_SHAPER_RATE(NIX_TM_MAX_RATE_EXPONENT, NIX_TM_MAX_RATE_MANTISSA, \
0)
#define NIX_TM_MIN_SHAPER_PPS_RATE 25
#define NIX_TM_MAX_SHAPER_PPS_RATE (100ul << 20)
/* NIX burst limits */
#define NIX_TM_MAX_BURST_EXPONENT 0xful
#define NIX_TM_MAX_BURST_MANTISSA 0x7ffful

1
drivers/common/cnxk/roc_nix_priv.h
View File

@ -90,6 +90,7 @@ struct nix_tm_shaper_profile {
struct nix_tm_tb commit;
struct nix_tm_tb peak;
int32_t pkt_len_adj;
int32_t pkt_mode_adj;
bool pkt_mode;
uint32_t id;
void (*free_fn)(void *profile);

76
drivers/common/cnxk/roc_nix_tm_ops.c
View File

@ -84,6 +84,51 @@ roc_nix_tm_free_resources(struct roc_nix *roc_nix, bool hw_only)
return nix_tm_free_resources(roc_nix, BIT(ROC_NIX_TM_USER), hw_only);
}
static int
nix_tm_adjust_shaper_pps_rate(struct nix_tm_shaper_profile *profile)
{
uint64_t min_rate = profile->commit.rate;
if (!profile->pkt_mode)
return 0;
profile->pkt_mode_adj = 1;
if (profile->commit.rate &&
(profile->commit.rate < NIX_TM_MIN_SHAPER_PPS_RATE ||
profile->commit.rate > NIX_TM_MAX_SHAPER_PPS_RATE))
return NIX_ERR_TM_INVALID_COMMIT_RATE;
if (profile->peak.rate &&
(profile->peak.rate < NIX_TM_MIN_SHAPER_PPS_RATE ||
profile->peak.rate > NIX_TM_MAX_SHAPER_PPS_RATE))
return NIX_ERR_TM_INVALID_PEAK_RATE;
if (profile->peak.rate && min_rate > profile->peak.rate)
min_rate = profile->peak.rate;
/* Each packet accomulate single count, whereas HW
* considers each unit as Byte, so we need convert
* user pps to bps
*/
profile->commit.rate = profile->commit.rate * 8;
profile->peak.rate = profile->peak.rate * 8;
min_rate = min_rate * 8;
if (min_rate && (min_rate < NIX_TM_MIN_SHAPER_RATE)) {
int adjust = NIX_TM_MIN_SHAPER_RATE / min_rate;
if (adjust > NIX_TM_LENGTH_ADJUST_MAX)
return NIX_ERR_TM_SHAPER_PKT_LEN_ADJUST;
profile->pkt_mode_adj += adjust;
profile->commit.rate += (adjust * profile->commit.rate);
profile->peak.rate += (adjust * profile->peak.rate);
}
return 0;
}
static int
nix_tm_shaper_profile_add(struct roc_nix *roc_nix,
struct nix_tm_shaper_profile *profile, int skip_ins)
@ -93,8 +138,13 @@ nix_tm_shaper_profile_add(struct roc_nix *roc_nix,
uint64_t min_burst, max_burst;
uint64_t peak_rate, peak_sz;
uint32_t id;
int rc;
id = profile->id;
rc = nix_tm_adjust_shaper_pps_rate(profile);
if (rc)
return rc;
commit_rate = profile->commit.rate;
commit_sz = profile->commit.size;
peak_rate = profile->peak.rate;
@ -164,17 +214,8 @@ roc_nix_tm_shaper_profile_add(struct roc_nix *roc_nix,
profile->ref_cnt = 0;
profile->id = roc_profile->id;
if (roc_profile->pkt_mode) {
/* Each packet accomulate single count, whereas HW
* considers each unit as Byte, so we need convert
* user pps to bps
*/
profile->commit.rate = roc_profile->commit_rate * 8;
profile->peak.rate = roc_profile->peak_rate * 8;
} else {
profile->commit.rate = roc_profile->commit_rate;
profile->peak.rate = roc_profile->peak_rate;
}
profile->commit.rate = roc_profile->commit_rate;
profile->peak.rate = roc_profile->peak_rate;
profile->commit.size = roc_profile->commit_sz;
profile->peak.size = roc_profile->peak_sz;
profile->pkt_len_adj = roc_profile->pkt_len_adj;
@ -192,17 +233,8 @@ roc_nix_tm_shaper_profile_update(struct roc_nix *roc_nix,
profile = (struct nix_tm_shaper_profile *)roc_profile->reserved;
if (roc_profile->pkt_mode) {
/* Each packet accomulate single count, whereas HW
* considers each unit as Byte, so we need convert
* user pps to bps
*/
profile->commit.rate = roc_profile->commit_rate * 8;
profile->peak.rate = roc_profile->peak_rate * 8;
} else {
profile->commit.rate = roc_profile->commit_rate;
profile->peak.rate = roc_profile->peak_rate;
}
profile->commit.rate = roc_profile->commit_rate;
profile->peak.rate = roc_profile->peak_rate;
profile->commit.size = roc_profile->commit_sz;
profile->peak.size = roc_profile->peak_sz;

4
drivers/common/cnxk/roc_nix_tm_utils.c
View File

@ -628,8 +628,8 @@ nix_tm_shaper_reg_prep(struct nix_tm_node *node,
memset(&pir, 0, sizeof(pir));
nix_tm_shaper_conf_get(profile, &cir, &pir);
if (node->pkt_mode)
adjust = 1;
if (profile && node->pkt_mode)
adjust = profile->pkt_mode_adj;
else if (profile)
adjust = profile->pkt_len_adj;