[v3,1/2] net/cnxk: update meter bpf ID in Receive Queue
Checks
Commit Message
Patch updates configured meter bpf is in receive queue
context during meter creation
Signed-off-by: Rakesh Kudurumalla <rkudurumalla@marvell.com>
Acked-by: Sunil Kumar Kori <skori@mavell.com>
---
v3: Fix commit message spelling
drivers/net/cnxk/cn10k_rte_flow.c | 7 +++----
drivers/net/cnxk/cnxk_ethdev_mtr.c | 21 ++++++++++++++++-----
2 files changed, 19 insertions(+), 9 deletions(-)
Comments
On Thu, Jan 13, 2022 at 5:58 PM Rakesh Kudurumalla
<rkudurumalla@marvell.com> wrote:
>
> Patch updates configured meter bpf is in receive queue
> context during meter creation
>
> Signed-off-by: Rakesh Kudurumalla <rkudurumalla@marvell.com>
> Acked-by: Sunil Kumar Kori <skori@mavell.com>
Series Acked-by: Jerin Jacob <jerinj@marvell.com>
Series applied to dpdk-next-net-mrvl/for-next-net with following git
log update. Thanks.
Author: Rakesh Kudurumalla <rkudurumalla@marvell.com>
Date: Thu Jan 13 17:58:07 2022 +0530
common/cnxk: update meter algorithm in band profile
Update meter algorithm in NIX's band profile structure.
Signed-off-by: Rakesh Kudurumalla <rkudurumalla@marvell.com>
Acked-by: Sunil Kumar Kori <skori@mavell.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>
Author: Rakesh Kudurumalla <rkudurumalla@marvell.com>
Date: Thu Jan 13 17:58:06 2022 +0530
net/cnxk: update meter BPF ID in Receive Queue
Patch updates configured meter BPF(Bandwidth profile) ID is in
receive queue context during meter creation.
Signed-off-by: Rakesh Kudurumalla <rkudurumalla@marvell.com>
Acked-by: Sunil Kumar Kori <skori@mavell.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>
> ---
> v3: Fix commit message spelling
> drivers/net/cnxk/cn10k_rte_flow.c | 7 +++----
> drivers/net/cnxk/cnxk_ethdev_mtr.c | 21 ++++++++++++++++-----
> 2 files changed, 19 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/net/cnxk/cn10k_rte_flow.c b/drivers/net/cnxk/cn10k_rte_flow.c
> index b830abe63e..529fb0e4b7 100644
> --- a/drivers/net/cnxk/cn10k_rte_flow.c
> +++ b/drivers/net/cnxk/cn10k_rte_flow.c
> @@ -36,20 +36,20 @@ cn10k_mtr_configure(struct rte_eth_dev *eth_dev,
> for (i = 0; actions[i].type != RTE_FLOW_ACTION_TYPE_END; i++) {
> if (actions[i].type == RTE_FLOW_ACTION_TYPE_METER) {
> mtr_conf = (const struct rte_flow_action_meter
> - *)(actions->conf);
> + *)(actions[i].conf);
> mtr_id = mtr_conf->mtr_id;
> is_mtr_act = true;
> }
> if (actions[i].type == RTE_FLOW_ACTION_TYPE_QUEUE) {
> q_conf = (const struct rte_flow_action_queue
> - *)(actions->conf);
> + *)(actions[i].conf);
> if (is_mtr_act)
> nix_mtr_rq_update(eth_dev, mtr_id, 1,
> &q_conf->index);
> }
> if (actions[i].type == RTE_FLOW_ACTION_TYPE_RSS) {
> rss_conf = (const struct rte_flow_action_rss
> - *)(actions->conf);
> + *)(actions[i].conf);
> if (is_mtr_act)
> nix_mtr_rq_update(eth_dev, mtr_id,
> rss_conf->queue_num,
> @@ -171,7 +171,6 @@ cn10k_flow_create(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr,
> return NULL;
> }
> }
> -
> for (i = 0; actions[i].type != RTE_FLOW_ACTION_TYPE_END; i++) {
> if (actions[i].type == RTE_FLOW_ACTION_TYPE_METER) {
> mtr = (const struct rte_flow_action_meter *)actions[i]
> diff --git a/drivers/net/cnxk/cnxk_ethdev_mtr.c b/drivers/net/cnxk/cnxk_ethdev_mtr.c
> index 39d8563826..cc783e5f86 100644
> --- a/drivers/net/cnxk/cnxk_ethdev_mtr.c
> +++ b/drivers/net/cnxk/cnxk_ethdev_mtr.c
> @@ -35,7 +35,6 @@ static struct rte_mtr_capabilities mtr_capa = {
> .chaining_n_mtrs_per_flow_max = NIX_MTR_COUNT_PER_FLOW,
> .chaining_use_prev_mtr_color_supported = true,
> .chaining_use_prev_mtr_color_enforced = true,
> - .meter_rate_max = NIX_BPF_RATE_MAX / 8, /* Bytes per second */
> .color_aware_srtcm_rfc2697_supported = true,
> .color_aware_trtcm_rfc2698_supported = true,
> .color_aware_trtcm_rfc4115_supported = true,
> @@ -180,13 +179,13 @@ cnxk_nix_mtr_capabilities_get(struct rte_eth_dev *dev,
> struct rte_mtr_capabilities *capa,
> struct rte_mtr_error *error)
> {
> - struct cnxk_eth_dev *eth_dev = cnxk_eth_pmd_priv(dev);
> - uint16_t count[ROC_NIX_BPF_LEVEL_MAX] = {0};
> uint8_t lvl_mask = ROC_NIX_BPF_LEVEL_F_LEAF | ROC_NIX_BPF_LEVEL_F_MID |
> ROC_NIX_BPF_LEVEL_F_TOP;
> + struct cnxk_eth_dev *eth_dev = cnxk_eth_pmd_priv(dev);
> + uint16_t count[ROC_NIX_BPF_LEVEL_MAX] = {0};
> struct roc_nix *nix = ð_dev->nix;
> - int rc;
> - int i;
> + uint32_t time_unit;
> + int rc, i;
>
> RTE_SET_USED(dev);
>
> @@ -207,6 +206,15 @@ cnxk_nix_mtr_capabilities_get(struct rte_eth_dev *dev,
> mtr_capa.meter_trtcm_rfc4115_n_max = mtr_capa.n_max;
> mtr_capa.meter_policy_n_max = mtr_capa.n_max;
>
> + rc = roc_nix_bpf_timeunit_get(nix, &time_unit);
> + if (rc)
> + return rc;
> +
> + mtr_capa.meter_rate_max =
> + NIX_BPF_RATE(time_unit, NIX_BPF_MAX_RATE_EXPONENT,
> + NIX_BPF_MAX_RATE_MANTISSA, 0) /
> + 8;
> +
> *capa = mtr_capa;
> return 0;
> }
> @@ -304,6 +312,9 @@ cnxk_nix_mtr_policy_validate(struct rte_eth_dev *dev,
> if (action->type == RTE_FLOW_ACTION_TYPE_DROP)
> supported[i] = true;
>
> + if (action->type == RTE_FLOW_ACTION_TYPE_VOID)
> + supported[i] = true;
> +
> if (!supported[i]) {
> sprintf(message,
> "%s action is not valid",
> --
> 2.25.1
>
@@ -36,20 +36,20 @@ cn10k_mtr_configure(struct rte_eth_dev *eth_dev,
for (i = 0; actions[i].type != RTE_FLOW_ACTION_TYPE_END; i++) {
if (actions[i].type == RTE_FLOW_ACTION_TYPE_METER) {
mtr_conf = (const struct rte_flow_action_meter
- *)(actions->conf);
+ *)(actions[i].conf);
mtr_id = mtr_conf->mtr_id;
is_mtr_act = true;
}
if (actions[i].type == RTE_FLOW_ACTION_TYPE_QUEUE) {
q_conf = (const struct rte_flow_action_queue
- *)(actions->conf);
+ *)(actions[i].conf);
if (is_mtr_act)
nix_mtr_rq_update(eth_dev, mtr_id, 1,
&q_conf->index);
}
if (actions[i].type == RTE_FLOW_ACTION_TYPE_RSS) {
rss_conf = (const struct rte_flow_action_rss
- *)(actions->conf);
+ *)(actions[i].conf);
if (is_mtr_act)
nix_mtr_rq_update(eth_dev, mtr_id,
rss_conf->queue_num,
@@ -171,7 +171,6 @@ cn10k_flow_create(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr,
return NULL;
}
}
-
for (i = 0; actions[i].type != RTE_FLOW_ACTION_TYPE_END; i++) {
if (actions[i].type == RTE_FLOW_ACTION_TYPE_METER) {
mtr = (const struct rte_flow_action_meter *)actions[i]
@@ -35,7 +35,6 @@ static struct rte_mtr_capabilities mtr_capa = {
.chaining_n_mtrs_per_flow_max = NIX_MTR_COUNT_PER_FLOW,
.chaining_use_prev_mtr_color_supported = true,
.chaining_use_prev_mtr_color_enforced = true,
- .meter_rate_max = NIX_BPF_RATE_MAX / 8, /* Bytes per second */
.color_aware_srtcm_rfc2697_supported = true,
.color_aware_trtcm_rfc2698_supported = true,
.color_aware_trtcm_rfc4115_supported = true,
@@ -180,13 +179,13 @@ cnxk_nix_mtr_capabilities_get(struct rte_eth_dev *dev,
struct rte_mtr_capabilities *capa,
struct rte_mtr_error *error)
{
- struct cnxk_eth_dev *eth_dev = cnxk_eth_pmd_priv(dev);
- uint16_t count[ROC_NIX_BPF_LEVEL_MAX] = {0};
uint8_t lvl_mask = ROC_NIX_BPF_LEVEL_F_LEAF | ROC_NIX_BPF_LEVEL_F_MID |
ROC_NIX_BPF_LEVEL_F_TOP;
+ struct cnxk_eth_dev *eth_dev = cnxk_eth_pmd_priv(dev);
+ uint16_t count[ROC_NIX_BPF_LEVEL_MAX] = {0};
struct roc_nix *nix = ð_dev->nix;
- int rc;
- int i;
+ uint32_t time_unit;
+ int rc, i;
RTE_SET_USED(dev);
@@ -207,6 +206,15 @@ cnxk_nix_mtr_capabilities_get(struct rte_eth_dev *dev,
mtr_capa.meter_trtcm_rfc4115_n_max = mtr_capa.n_max;
mtr_capa.meter_policy_n_max = mtr_capa.n_max;
+ rc = roc_nix_bpf_timeunit_get(nix, &time_unit);
+ if (rc)
+ return rc;
+
+ mtr_capa.meter_rate_max =
+ NIX_BPF_RATE(time_unit, NIX_BPF_MAX_RATE_EXPONENT,
+ NIX_BPF_MAX_RATE_MANTISSA, 0) /
+ 8;
+
*capa = mtr_capa;
return 0;
}
@@ -304,6 +312,9 @@ cnxk_nix_mtr_policy_validate(struct rte_eth_dev *dev,
if (action->type == RTE_FLOW_ACTION_TYPE_DROP)
supported[i] = true;
+ if (action->type == RTE_FLOW_ACTION_TYPE_VOID)
+ supported[i] = true;
+
if (!supported[i]) {
sprintf(message,
"%s action is not valid",