[dpdk-dev] crypto/scheduler: add get attached slaves API

Message ID 1487690086-45732-1-git-send-email-roy.fan.zhang@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Pablo de Lara Guarch
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Fan Zhang Feb. 21, 2017, 3:14 p.m. UTC
  This patch adds an API to get the run-time slaves number and list
of a cryptodev scheduler PMD.

Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>
---
 drivers/crypto/scheduler/rte_cryptodev_scheduler.c | 31 ++++++++++++++++++++++
 drivers/crypto/scheduler/rte_cryptodev_scheduler.h | 23 ++++++++++++++++
 .../scheduler/rte_pmd_crypto_scheduler_version.map |  7 +++++
 3 files changed, 61 insertions(+)
  

Comments

Sergio Gonzalez Monroy March 29, 2017, 4:16 p.m. UTC | #1
On 21/02/2017 15:14, Fan Zhang wrote:
> This patch adds an API to get the run-time slaves number and list
> of a cryptodev scheduler PMD.
>
> Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>
> ---
>   drivers/crypto/scheduler/rte_cryptodev_scheduler.c | 31 ++++++++++++++++++++++
>   drivers/crypto/scheduler/rte_cryptodev_scheduler.h | 23 ++++++++++++++++
>   .../scheduler/rte_pmd_crypto_scheduler_version.map |  7 +++++
>   3 files changed, 61 insertions(+)
>
> diff --git a/drivers/crypto/scheduler/rte_cryptodev_scheduler.c b/drivers/crypto/scheduler/rte_cryptodev_scheduler.c
> index 11e8143..55c0ec4 100644
> --- a/drivers/crypto/scheduler/rte_cryptodev_scheduler.c
> +++ b/drivers/crypto/scheduler/rte_cryptodev_scheduler.c
> @@ -469,3 +469,34 @@ rte_cryptodev_scheduler_load_user_scheduler(uint8_t scheduler_id,
>   
>   	return 0;
>   }
> +
> +int
> +rte_cryptodev_scheduler_slaves_get(uint8_t scheduler_id, uint8_t *slaves)
> +{
> +	struct rte_cryptodev *dev = rte_cryptodev_pmd_get_dev(scheduler_id);
> +	struct scheduler_ctx *sched_ctx;
> +	int nb_slaves = 0;
> +
> +	if (!dev) {
> +		CS_LOG_ERR("Operation not supported");
> +		return -ENOTSUP;
> +	}
> +
> +	if (dev->dev_type != RTE_CRYPTODEV_SCHEDULER_PMD) {
> +		CS_LOG_ERR("Operation not supported");
> +		return -ENOTSUP;
> +	}
> +
> +	sched_ctx = dev->data->dev_private;
> +
> +	nb_slaves = (int)sched_ctx->nb_slaves;
> +
> +	if (slaves) {
> +		int i;
> +
> +		for (i = 0; i < nb_slaves; i++)
> +			slaves[i] = sched_ctx->slaves[i].dev_id;
> +	}
> +
> +	return 0;
> +}
> diff --git a/drivers/crypto/scheduler/rte_cryptodev_scheduler.h b/drivers/crypto/scheduler/rte_cryptodev_scheduler.h
> index 7ef44e7..0e32895 100644
> --- a/drivers/crypto/scheduler/rte_cryptodev_scheduler.h
> +++ b/drivers/crypto/scheduler/rte_cryptodev_scheduler.h
> @@ -40,6 +40,11 @@
>   extern "C" {
>   #endif
>   
> +/**< Maximum number of bonded devices per devices */
> +#ifndef RTE_CRYPTODEV_SCHEDULER_MAX_NB_SLAVES
> +#define RTE_CRYPTODEV_SCHEDULER_MAX_NB_SLAVES	(8)
> +#endif
> +

There is a private macro MAX_SLAVES_NUM in 
crypto/scheduler/scheduler_pmd_private.h
IMO you should remove it and just use the one in this patch if it needs 
to be public.

>   /**
>    * Crypto scheduler PMD operation modes
>    */
> @@ -143,6 +148,24 @@ rte_cryptodev_scheduler_ordering_set(uint8_t scheduler_id,
>   int
>   rte_cryptodev_scheduler_ordering_get(uint8_t scheduler_id);
>   
> +/**
> + * Get the the attached slaves' count and/or ID
> + *
> + *@param	scheduler_id	The target scheduler device ID
> + *		slaves		If successful, the slaves' device
> + *				IDs will be written. This parameter
> + *				can be NULL, but otherwise please NOTE
> + *				it should be an uint8_t array of at least
> + *				RTE_CRYPTODEV_SCHEDULER_MAX_NB_SLAVES
> + *				elements.
> + *
> + * @return
> + *	non-negative number: the number of slaves attached
> + *	negative integer if error occurs.
> + */
> +int
> +rte_cryptodev_scheduler_slaves_get(uint8_t scheduler_id, uint8_t *slaves);
> +
>   typedef uint16_t (*rte_cryptodev_scheduler_burst_enqueue_t)(void *qp_ctx,
>   		struct rte_crypto_op **ops, uint16_t nb_ops);
>   
> diff --git a/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map b/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map
> index a485b43..69cf0c6 100644
> --- a/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map
> +++ b/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map
> @@ -10,3 +10,10 @@ DPDK_17.02 {
>   	rte_cryptodev_scheduler_ordering_get;
>   
>   };
> +
> +DPDK_17.05 {
> +	global:
> +
> +	rte_cryptodev_scheduler_slaves_get;
> +
> +} DPDK_17.02;
  
De Lara Guarch, Pablo March 29, 2017, 9:24 p.m. UTC | #2
Hi Fan,

> -----Original Message-----
> From: Zhang, Roy Fan
> Sent: Tuesday, February 21, 2017 3:15 PM
> To: dev@dpdk.org
> Cc: De Lara Guarch, Pablo
> Subject: [PATCH] crypto/scheduler: add get attached slaves API
> 
> This patch adds an API to get the run-time slaves number and list
> of a cryptodev scheduler PMD.
> 
> Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>
> ---
>  drivers/crypto/scheduler/rte_cryptodev_scheduler.c | 31
> ++++++++++++++++++++++
>  drivers/crypto/scheduler/rte_cryptodev_scheduler.h | 23
> ++++++++++++++++
>  .../scheduler/rte_pmd_crypto_scheduler_version.map |  7 +++++
>  3 files changed, 61 insertions(+)
> 
> diff --git a/drivers/crypto/scheduler/rte_cryptodev_scheduler.c
> b/drivers/crypto/scheduler/rte_cryptodev_scheduler.c
> index 11e8143..55c0ec4 100644
> --- a/drivers/crypto/scheduler/rte_cryptodev_scheduler.c
> +++ b/drivers/crypto/scheduler/rte_cryptodev_scheduler.c
> @@ -469,3 +469,34 @@
> rte_cryptodev_scheduler_load_user_scheduler(uint8_t scheduler_id,
> 
>  	return 0;
>  }
> +
> +int
> +rte_cryptodev_scheduler_slaves_get(uint8_t scheduler_id, uint8_t
> *slaves)
> +{
> +	struct rte_cryptodev *dev =
> rte_cryptodev_pmd_get_dev(scheduler_id);
> +	struct scheduler_ctx *sched_ctx;
> +	int nb_slaves = 0;

This variable should be uint32_t (or uint8_t, as not more than 8 slaves are allowed).
> +
> +	if (!dev) {
> +		CS_LOG_ERR("Operation not supported");
> +		return -ENOTSUP;
> +	}
> +
> +	if (dev->dev_type != RTE_CRYPTODEV_SCHEDULER_PMD) {
> +		CS_LOG_ERR("Operation not supported");
> +		return -ENOTSUP;
> +	}
> +
> +	sched_ctx = dev->data->dev_private;
> +
> +	nb_slaves = (int)sched_ctx->nb_slaves;
> +
> +	if (slaves) {
> +		int i;

uint8_t i

> +
> +		for (i = 0; i < nb_slaves; i++)
> +			slaves[i] = sched_ctx->slaves[i].dev_id;
> +	}
> +
> +	return 0;

Shouldn't you return "nb_slaves" here (might need cast to int)?

> +}
> diff --git a/drivers/crypto/scheduler/rte_cryptodev_scheduler.h
> b/drivers/crypto/scheduler/rte_cryptodev_scheduler.h
> index 7ef44e7..0e32895 100644
> --- a/drivers/crypto/scheduler/rte_cryptodev_scheduler.h
> +++ b/drivers/crypto/scheduler/rte_cryptodev_scheduler.h
> @@ -40,6 +40,11 @@
>  extern "C" {
>  #endif
> 
> +/**< Maximum number of bonded devices per devices */

Typo: "per device".

> +#ifndef RTE_CRYPTODEV_SCHEDULER_MAX_NB_SLAVES
> +#define RTE_CRYPTODEV_SCHEDULER_MAX_NB_SLAVES	(8)
> +#endif
> +
>  /**
>   * Crypto scheduler PMD operation modes
>   */
> @@ -143,6 +148,24 @@ rte_cryptodev_scheduler_ordering_set(uint8_t
> scheduler_id,
>  int
>  rte_cryptodev_scheduler_ordering_get(uint8_t scheduler_id);
> 
> +/**
> + * Get the the attached slaves' count and/or ID
> + *
> + *@param	scheduler_id	The target scheduler device ID
> + *		slaves		If successful, the slaves' device

Follow the convention for Doxygen comments. Use @param for every parameter,
and start the description in the next line.

> + *				IDs will be written. This parameter
> + *				can be NULL, but otherwise please NOTE
> + *				it should be an uint8_t array of at least
> + *
> 	RTE_CRYPTODEV_SCHEDULER_MAX_NB_SLAVES
> + *				elements.
> + *
> + * @return
> + *	non-negative number: the number of slaves attached
> + *	negative integer if error occurs.
> + */
> +int
> +rte_cryptodev_scheduler_slaves_get(uint8_t scheduler_id, uint8_t
> *slaves);
> +
>  typedef uint16_t (*rte_cryptodev_scheduler_burst_enqueue_t)(void
> *qp_ctx,
>  		struct rte_crypto_op **ops, uint16_t nb_ops);
>
  

Patch

diff --git a/drivers/crypto/scheduler/rte_cryptodev_scheduler.c b/drivers/crypto/scheduler/rte_cryptodev_scheduler.c
index 11e8143..55c0ec4 100644
--- a/drivers/crypto/scheduler/rte_cryptodev_scheduler.c
+++ b/drivers/crypto/scheduler/rte_cryptodev_scheduler.c
@@ -469,3 +469,34 @@  rte_cryptodev_scheduler_load_user_scheduler(uint8_t scheduler_id,
 
 	return 0;
 }
+
+int
+rte_cryptodev_scheduler_slaves_get(uint8_t scheduler_id, uint8_t *slaves)
+{
+	struct rte_cryptodev *dev = rte_cryptodev_pmd_get_dev(scheduler_id);
+	struct scheduler_ctx *sched_ctx;
+	int nb_slaves = 0;
+
+	if (!dev) {
+		CS_LOG_ERR("Operation not supported");
+		return -ENOTSUP;
+	}
+
+	if (dev->dev_type != RTE_CRYPTODEV_SCHEDULER_PMD) {
+		CS_LOG_ERR("Operation not supported");
+		return -ENOTSUP;
+	}
+
+	sched_ctx = dev->data->dev_private;
+
+	nb_slaves = (int)sched_ctx->nb_slaves;
+
+	if (slaves) {
+		int i;
+
+		for (i = 0; i < nb_slaves; i++)
+			slaves[i] = sched_ctx->slaves[i].dev_id;
+	}
+
+	return 0;
+}
diff --git a/drivers/crypto/scheduler/rte_cryptodev_scheduler.h b/drivers/crypto/scheduler/rte_cryptodev_scheduler.h
index 7ef44e7..0e32895 100644
--- a/drivers/crypto/scheduler/rte_cryptodev_scheduler.h
+++ b/drivers/crypto/scheduler/rte_cryptodev_scheduler.h
@@ -40,6 +40,11 @@ 
 extern "C" {
 #endif
 
+/**< Maximum number of bonded devices per devices */
+#ifndef RTE_CRYPTODEV_SCHEDULER_MAX_NB_SLAVES
+#define RTE_CRYPTODEV_SCHEDULER_MAX_NB_SLAVES	(8)
+#endif
+
 /**
  * Crypto scheduler PMD operation modes
  */
@@ -143,6 +148,24 @@  rte_cryptodev_scheduler_ordering_set(uint8_t scheduler_id,
 int
 rte_cryptodev_scheduler_ordering_get(uint8_t scheduler_id);
 
+/**
+ * Get the the attached slaves' count and/or ID
+ *
+ *@param	scheduler_id	The target scheduler device ID
+ *		slaves		If successful, the slaves' device
+ *				IDs will be written. This parameter
+ *				can be NULL, but otherwise please NOTE
+ *				it should be an uint8_t array of at least
+ *				RTE_CRYPTODEV_SCHEDULER_MAX_NB_SLAVES
+ *				elements.
+ *
+ * @return
+ *	non-negative number: the number of slaves attached
+ *	negative integer if error occurs.
+ */
+int
+rte_cryptodev_scheduler_slaves_get(uint8_t scheduler_id, uint8_t *slaves);
+
 typedef uint16_t (*rte_cryptodev_scheduler_burst_enqueue_t)(void *qp_ctx,
 		struct rte_crypto_op **ops, uint16_t nb_ops);
 
diff --git a/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map b/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map
index a485b43..69cf0c6 100644
--- a/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map
+++ b/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map
@@ -10,3 +10,10 @@  DPDK_17.02 {
 	rte_cryptodev_scheduler_ordering_get;
 
 };
+
+DPDK_17.05 {
+	global:
+
+	rte_cryptodev_scheduler_slaves_get;
+
+} DPDK_17.02;