diff mbox series

[v2,4/5] bbdev: improving error handling for queue configuration

Message ID 20230615164901.40845-5-nicolas.chautru@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Maxime Coquelin
Headers
Series bbdev: API extension for 23.11 |

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Chautru, Nicolas June 15, 2023, 4:49 p.m. UTC 
  Refactor of the error handling based on available priority
queue to be more generic.

Signed-off-by: Nicolas Chautru <nicolas.chautru@intel.com>
---
 lib/bbdev/rte_bbdev.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

Comments

Maxime Coquelin Sept. 18, 2023, 3:20 p.m. UTC | #1 
On 6/15/23 18:49, Nicolas Chautru wrote:
> Refactor of the error handling based on available priority
> queue to be more generic.
> 
> Signed-off-by: Nicolas Chautru <nicolas.chautru@intel.com>
> ---
>   lib/bbdev/rte_bbdev.c | 15 ++++++---------
>   1 file changed, 6 insertions(+), 9 deletions(-)
> 
> diff --git a/lib/bbdev/rte_bbdev.c b/lib/bbdev/rte_bbdev.c
> index 26fc077bdc..589b796ea3 100644
> --- a/lib/bbdev/rte_bbdev.c
> +++ b/lib/bbdev/rte_bbdev.c
> @@ -441,6 +441,7 @@ rte_bbdev_queue_configure(uint16_t dev_id, uint16_t queue_id,
>   	const struct rte_bbdev_op_cap *p;
>   	struct rte_bbdev_queue_conf *stored_conf;
>   	const char *op_type_str;
> +	unsigned int max_priority;
>   	VALID_DEV_OR_RET_ERR(dev, dev_id);
>   
>   	VALID_DEV_OPS_OR_RET_ERR(dev, dev_id);
> @@ -494,20 +495,16 @@ rte_bbdev_queue_configure(uint16_t dev_id, uint16_t queue_id,
>   					conf->queue_size, queue_id, dev_id);
>   			return -EINVAL;
>   		}
> -		if (conf->op_type == RTE_BBDEV_OP_TURBO_DEC &&
> -			conf->priority > dev_info.max_ul_queue_priority) {
> +		if ((uint8_t)conf->op_type >= RTE_BBDEV_OP_TYPE_SIZE_MAX) {
>   			rte_bbdev_log(ERR,
> -					"Priority (%u) of queue %u of bbdev %u must be <= %u",
> -					conf->priority, queue_id, dev_id,
> -					dev_info.max_ul_queue_priority);
> +					"Invalid operation type (%u) ", conf->op_type);
>   			return -EINVAL;
>   		}
> -		if (conf->op_type == RTE_BBDEV_OP_TURBO_ENC &&
> -			conf->priority > dev_info.max_dl_queue_priority) {
> +		max_priority = dev_info.queue_priority[conf->op_type];
> +		if (conf->priority > max_priority) {
>   			rte_bbdev_log(ERR,
>   					"Priority (%u) of queue %u of bbdev %u must be <= %u",
> -					conf->priority, queue_id, dev_id,
> -					dev_info.max_dl_queue_priority);
> +					conf->priority, queue_id, dev_id, max_priority);
>   			return -EINVAL;
>   		}
>   	}

Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>

Maxime
diff mbox series

Patch

diff --git a/lib/bbdev/rte_bbdev.c b/lib/bbdev/rte_bbdev.c
index 26fc077bdc..589b796ea3 100644
--- a/lib/bbdev/rte_bbdev.c
+++ b/lib/bbdev/rte_bbdev.c
@@ -441,6 +441,7 @@  rte_bbdev_queue_configure(uint16_t dev_id, uint16_t queue_id,
 	const struct rte_bbdev_op_cap *p;
 	struct rte_bbdev_queue_conf *stored_conf;
 	const char *op_type_str;
+	unsigned int max_priority;
 	VALID_DEV_OR_RET_ERR(dev, dev_id);
 
 	VALID_DEV_OPS_OR_RET_ERR(dev, dev_id);
@@ -494,20 +495,16 @@  rte_bbdev_queue_configure(uint16_t dev_id, uint16_t queue_id,
 					conf->queue_size, queue_id, dev_id);
 			return -EINVAL;
 		}
-		if (conf->op_type == RTE_BBDEV_OP_TURBO_DEC &&
-			conf->priority > dev_info.max_ul_queue_priority) {
+		if ((uint8_t)conf->op_type >= RTE_BBDEV_OP_TYPE_SIZE_MAX) {
 			rte_bbdev_log(ERR,
-					"Priority (%u) of queue %u of bbdev %u must be <= %u",
-					conf->priority, queue_id, dev_id,
-					dev_info.max_ul_queue_priority);
+					"Invalid operation type (%u) ", conf->op_type);
 			return -EINVAL;
 		}
-		if (conf->op_type == RTE_BBDEV_OP_TURBO_ENC &&
-			conf->priority > dev_info.max_dl_queue_priority) {
+		max_priority = dev_info.queue_priority[conf->op_type];
+		if (conf->priority > max_priority) {
 			rte_bbdev_log(ERR,
 					"Priority (%u) of queue %u of bbdev %u must be <= %u",
-					conf->priority, queue_id, dev_id,
-					dev_info.max_dl_queue_priority);
+					conf->priority, queue_id, dev_id, max_priority);
 			return -EINVAL;
 		}
 	}