* Re: [dpdk-dev] [PATCH] crypto/scheduler: add get attached slaves API
2017-02-21 15:14 [dpdk-dev] [PATCH] crypto/scheduler: add get attached slaves API Fan Zhang
@ 2017-03-29 16:16 ` Sergio Gonzalez Monroy
2017-03-29 21:24 ` De Lara Guarch, Pablo
2017-03-30 13:39 ` Fan Zhang
2 siblings, 0 replies; 6+ messages in thread
From: Sergio Gonzalez Monroy @ 2017-03-29 16:16 UTC (permalink / raw)
To: Fan Zhang, dev; +Cc: pablo.de.lara.guarch
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;
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-dev] [PATCH] crypto/scheduler: add get attached slaves API
2017-02-21 15:14 [dpdk-dev] [PATCH] crypto/scheduler: add get attached slaves API Fan Zhang
2017-03-29 16:16 ` Sergio Gonzalez Monroy
@ 2017-03-29 21:24 ` De Lara Guarch, Pablo
2017-03-30 13:39 ` Fan Zhang
2 siblings, 0 replies; 6+ messages in thread
From: De Lara Guarch, Pablo @ 2017-03-29 21:24 UTC (permalink / raw)
To: Zhang, Roy Fan, dev
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);
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [dpdk-dev] [PATCH] crypto/scheduler: add get attached slaves API
2017-02-21 15:14 [dpdk-dev] [PATCH] crypto/scheduler: add get attached slaves API Fan Zhang
2017-03-29 16:16 ` Sergio Gonzalez Monroy
2017-03-29 21:24 ` De Lara Guarch, Pablo
@ 2017-03-30 13:39 ` Fan Zhang
2017-03-31 8:38 ` De Lara Guarch, Pablo
2017-03-31 9:55 ` De Lara Guarch, Pablo
2 siblings, 2 replies; 6+ messages in thread
From: Fan Zhang @ 2017-03-30 13:39 UTC (permalink / raw)
To: dev; +Cc: pablo.de.lara.guarch, sergio.gonzalez.monroy, declan.doherty
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>
---
v2:
- Fixed slave number return bug
- Replaced priviate macro MAX_SLAVE_NUM with public macro
RTE_CRYPTODEV_SCHEDULER_MAX_NB_SLAVES
drivers/crypto/scheduler/rte_cryptodev_scheduler.c | 34 +++++++++++++++++++++-
drivers/crypto/scheduler/rte_cryptodev_scheduler.h | 22 ++++++++++++++
.../scheduler/rte_pmd_crypto_scheduler_version.map | 7 +++++
drivers/crypto/scheduler/scheduler_pmd.c | 4 +--
drivers/crypto/scheduler/scheduler_pmd_private.h | 10 ++-----
drivers/crypto/scheduler/scheduler_roundrobin.c | 5 ++--
6 files changed, 70 insertions(+), 12 deletions(-)
diff --git a/drivers/crypto/scheduler/rte_cryptodev_scheduler.c b/drivers/crypto/scheduler/rte_cryptodev_scheduler.c
index 9c33be8..6018857 100644
--- a/drivers/crypto/scheduler/rte_cryptodev_scheduler.c
+++ b/drivers/crypto/scheduler/rte_cryptodev_scheduler.c
@@ -209,7 +209,8 @@ rte_cryptodev_scheduler_slave_attach(uint8_t scheduler_id, uint8_t slave_id)
}
sched_ctx = dev->data->dev_private;
- if (sched_ctx->nb_slaves >= MAX_SLAVES_NUM) {
+ if (sched_ctx->nb_slaves >=
+ RTE_CRYPTODEV_SCHEDULER_MAX_NB_SLAVES) {
CS_LOG_ERR("Too many slaves attached");
return -ENOMEM;
}
@@ -483,3 +484,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;
+ uint32_t 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 = sched_ctx->nb_slaves;
+
+ if (slaves && nb_slaves) {
+ uint32_t i;
+
+ for (i = 0; i < nb_slaves; i++)
+ slaves[i] = sched_ctx->slaves[i].dev_id;
+ }
+
+ return (int)nb_slaves;
+}
diff --git a/drivers/crypto/scheduler/rte_cryptodev_scheduler.h b/drivers/crypto/scheduler/rte_cryptodev_scheduler.h
index 306dfea..348fa58 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
*/
@@ -147,6 +152,23 @@ 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 function will write back
+ * all slaves' device IDs to it. This
+ * parameter SHALL either be an uint8_t array
+ * of RTE_CRYPTODEV_SCHEDULER_MAX_NB_SLAVES
+ * elements or NULL.
+ *
+ * @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;
diff --git a/drivers/crypto/scheduler/scheduler_pmd.c b/drivers/crypto/scheduler/scheduler_pmd.c
index c1679ec..dc7192f 100644
--- a/drivers/crypto/scheduler/scheduler_pmd.c
+++ b/drivers/crypto/scheduler/scheduler_pmd.c
@@ -44,7 +44,7 @@
struct scheduler_init_params {
struct rte_crypto_vdev_init_params def_p;
uint32_t nb_slaves;
- uint8_t slaves[MAX_SLAVES_NUM];
+ uint8_t slaves[RTE_CRYPTODEV_SCHEDULER_MAX_NB_SLAVES];
};
#define RTE_CRYPTODEV_VDEV_NAME ("name")
@@ -222,7 +222,7 @@ parse_slave_arg(const char *key __rte_unused,
return -1;
}
- if (param->nb_slaves >= MAX_SLAVES_NUM - 1) {
+ if (param->nb_slaves >= RTE_CRYPTODEV_SCHEDULER_MAX_NB_SLAVES - 1) {
CS_LOG_ERR("Too many slaves.\n");
return -1;
}
diff --git a/drivers/crypto/scheduler/scheduler_pmd_private.h b/drivers/crypto/scheduler/scheduler_pmd_private.h
index f0861cd..2f4feea 100644
--- a/drivers/crypto/scheduler/scheduler_pmd_private.h
+++ b/drivers/crypto/scheduler/scheduler_pmd_private.h
@@ -36,11 +36,6 @@
#include "rte_cryptodev_scheduler.h"
-/**< Maximum number of bonded devices per devices */
-#ifndef MAX_SLAVES_NUM
-#define MAX_SLAVES_NUM (8)
-#endif
-
#define PER_SLAVE_BUFF_SIZE (256)
#define CS_LOG_ERR(fmt, args...) \
@@ -80,7 +75,7 @@ struct scheduler_ctx {
uint32_t max_nb_queue_pairs;
- struct scheduler_slave slaves[MAX_SLAVES_NUM];
+ struct scheduler_slave slaves[RTE_CRYPTODEV_SCHEDULER_MAX_NB_SLAVES];
uint32_t nb_slaves;
enum rte_cryptodev_scheduler_mode mode;
@@ -103,7 +98,8 @@ struct scheduler_qp_ctx {
} __rte_cache_aligned;
struct scheduler_session {
- struct rte_cryptodev_sym_session *sessions[MAX_SLAVES_NUM];
+ struct rte_cryptodev_sym_session *sessions[
+ RTE_CRYPTODEV_SCHEDULER_MAX_NB_SLAVES];
};
static inline uint16_t __attribute__((always_inline))
diff --git a/drivers/crypto/scheduler/scheduler_roundrobin.c b/drivers/crypto/scheduler/scheduler_roundrobin.c
index f276132..1fb6ce7 100644
--- a/drivers/crypto/scheduler/scheduler_roundrobin.c
+++ b/drivers/crypto/scheduler/scheduler_roundrobin.c
@@ -37,7 +37,7 @@
#include "scheduler_pmd_private.h"
struct rr_scheduler_qp_ctx {
- struct scheduler_slave slaves[MAX_SLAVES_NUM];
+ struct scheduler_slave slaves[RTE_CRYPTODEV_SCHEDULER_MAX_NB_SLAVES];
uint32_t nb_slaves;
uint32_t last_enq_slave_idx;
@@ -211,7 +211,8 @@ scheduler_start(struct rte_cryptodev *dev)
qp_ctx->private_qp_ctx;
uint32_t j;
- memset(rr_qp_ctx->slaves, 0, MAX_SLAVES_NUM *
+ memset(rr_qp_ctx->slaves, 0,
+ RTE_CRYPTODEV_SCHEDULER_MAX_NB_SLAVES *
sizeof(struct scheduler_slave));
for (j = 0; j < sched_ctx->nb_slaves; j++) {
rr_qp_ctx->slaves[j].dev_id =
--
2.7.4
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-dev] [PATCH] crypto/scheduler: add get attached slaves API
2017-03-30 13:39 ` Fan Zhang
@ 2017-03-31 8:38 ` De Lara Guarch, Pablo
2017-03-31 9:55 ` De Lara Guarch, Pablo
1 sibling, 0 replies; 6+ messages in thread
From: De Lara Guarch, Pablo @ 2017-03-31 8:38 UTC (permalink / raw)
To: Zhang, Roy Fan, dev; +Cc: Gonzalez Monroy, Sergio, Doherty, Declan
> -----Original Message-----
> From: Zhang, Roy Fan
> Sent: Thursday, March 30, 2017 2:39 PM
> To: dev@dpdk.org
> Cc: De Lara Guarch, Pablo; Gonzalez Monroy, Sergio; Doherty, Declan
> 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>
Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-dev] [PATCH] crypto/scheduler: add get attached slaves API
2017-03-30 13:39 ` Fan Zhang
2017-03-31 8:38 ` De Lara Guarch, Pablo
@ 2017-03-31 9:55 ` De Lara Guarch, Pablo
1 sibling, 0 replies; 6+ messages in thread
From: De Lara Guarch, Pablo @ 2017-03-31 9:55 UTC (permalink / raw)
To: Zhang, Roy Fan, dev; +Cc: Gonzalez Monroy, Sergio, Doherty, Declan
> -----Original Message-----
> From: De Lara Guarch, Pablo
> Sent: Friday, March 31, 2017 9:38 AM
> To: Zhang, Roy Fan; dev@dpdk.org
> Cc: Gonzalez Monroy, Sergio; Doherty, Declan
> Subject: RE: [PATCH] crypto/scheduler: add get attached slaves API
>
>
>
> > -----Original Message-----
> > From: Zhang, Roy Fan
> > Sent: Thursday, March 30, 2017 2:39 PM
> > To: dev@dpdk.org
> > Cc: De Lara Guarch, Pablo; Gonzalez Monroy, Sergio; Doherty, Declan
> > 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>
>
> Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Applied to dpdk-next-crypto.
Thanks,
Pablo
^ permalink raw reply [flat|nested] 6+ messages in thread