[PATCH 1/2] net/cnxk: update meter bpf ID in rq

[Ferruh Yigit]

On 11/30/2021 6:41 AM, Rakesh Kudurumalla wrote:
> Patch updates configured meter bpf is in rq context
> during meter creation

RQ is receive queue, right? Can you please use the long version for clarification?

> 
> Signed-off-by: Rakesh Kudurumalla <rkudurumalla at marvell.com>
> ---
>   drivers/net/cnxk/cn10k_rte_flow.c  |  9 ++++-----
>   drivers/net/cnxk/cnxk_ethdev_mtr.c | 25 ++++++++++++++++++-------
>   2 files changed, 22 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/net/cnxk/cn10k_rte_flow.c b/drivers/net/cnxk/cn10k_rte_flow.c
> index b830abe63e..402bb1c72f 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,
> @@ -98,7 +98,7 @@ cn10k_rss_action_validate(struct rte_eth_dev *eth_dev,
>   		return -EINVAL;
>   	}
>   
> -	if (eth_dev->data->dev_conf.rxmode.mq_mode != RTE_ETH_MQ_RX_RSS) {
> +	if (eth_dev->data->dev_conf.rxmode.mq_mode != ETH_MQ_RX_RSS) {

This change seems unintended. Please keep the original value.



<...>

>   	if (!capa)
>   		return -rte_mtr_error_set(error, EINVAL,
> -				RTE_MTR_ERROR_TYPE_MTR_PARAMS, NULL,
> -				"NULL input parameter");
> +					  RTE_MTR_ERROR_TYPE_MTR_PARAMS, NULL,
> +					  "NULL input parameter");
>   

Previous indentation looks more consistent with DPDK coding guide.