On 2021/10/19 22:10, Kevin Laatz wrote:
> Add statistic tracking for DSA devices.
>
> The dmadev library documentation is also updated to add a generic section
> for using the library's statistics APIs.
>
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> Signed-off-by: Kevin Laatz <kevin.laatz@intel.com>
> Reviewed-by: Conor Walsh <conor.walsh@intel.com>
> Reviewed-by: Chengwen Feng <fengchengwen@huawei.com>
> ---
> doc/guides/prog_guide/dmadev.rst | 11 +++++++++++
> drivers/dma/idxd/idxd_bus.c | 2 ++
> drivers/dma/idxd/idxd_common.c | 27 +++++++++++++++++++++++++++
> drivers/dma/idxd/idxd_internal.h | 5 +++++
> drivers/dma/idxd/idxd_pci.c | 2 ++
> 5 files changed, 47 insertions(+)
>
> diff --git a/doc/guides/prog_guide/dmadev.rst b/doc/guides/prog_guide/dmadev.rst
> index e853ffda3a..139eaff299 100644
> --- a/doc/guides/prog_guide/dmadev.rst
> +++ b/doc/guides/prog_guide/dmadev.rst
> @@ -107,3 +107,14 @@ completed operations along with the status of each operation (filled into the
> ``status`` array passed by user). These two APIs can also return the last
> completed operation's ``ring_idx`` which could help user track operations within
> their own application-defined rings.
> +
> +
> +Querying Device Statistics
> +~~~~~~~~~~~~~~~~~~~~~~~~~~~
could remove last ~
anyway,
Reviewed-by: Chengwen Feng <fengchengwen@huawei.com>
> +
> +The statistics from a dmadev device can be got via the statistics functions,
> +i.e. ``rte_dma_stats_get()``. The statistics returned for each device instance are:
> +
> +* ``submitted``: The number of operations submitted to the device.
> +* ``completed``: The number of operations which have completed (successful and failed).
> +* ``errors``: The number of operations that completed with error.
> diff --git a/drivers/dma/idxd/idxd_bus.c b/drivers/dma/idxd/idxd_bus.c
> index b2acdac4f9..b52ea02854 100644
> --- a/drivers/dma/idxd/idxd_bus.c
> +++ b/drivers/dma/idxd/idxd_bus.c
> @@ -99,6 +99,8 @@ static const struct rte_dma_dev_ops idxd_bus_ops = {
> .dev_configure = idxd_configure,
> .vchan_setup = idxd_vchan_setup,
> .dev_info_get = idxd_info_get,
> + .stats_get = idxd_stats_get,
> + .stats_reset = idxd_stats_reset,
> };
>
[snip]
>
@@ -107,3 +107,14 @@ completed operations along with the status of each operation (filled into the
``status`` array passed by user). These two APIs can also return the last
completed operation's ``ring_idx`` which could help user track operations within
their own application-defined rings.
+
+
+Querying Device Statistics
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The statistics from a dmadev device can be got via the statistics functions,
+i.e. ``rte_dma_stats_get()``. The statistics returned for each device instance are:
+
+* ``submitted``: The number of operations submitted to the device.
+* ``completed``: The number of operations which have completed (successful and failed).
+* ``errors``: The number of operations that completed with error.
@@ -99,6 +99,8 @@ static const struct rte_dma_dev_ops idxd_bus_ops = {
.dev_configure = idxd_configure,
.vchan_setup = idxd_vchan_setup,
.dev_info_get = idxd_info_get,
+ .stats_get = idxd_stats_get,
+ .stats_reset = idxd_stats_reset,
};
static void *
@@ -65,6 +65,8 @@ __submit(struct idxd_dmadev *idxd)
if (++idxd->batch_idx_write > idxd->max_batches)
idxd->batch_idx_write = 0;
+ idxd->stats.submitted += idxd->batch_size;
+
idxd->batch_start += idxd->batch_size;
idxd->batch_size = 0;
idxd->batch_idx_ring[idxd->batch_idx_write] = idxd->batch_start;
@@ -276,6 +278,8 @@ batch_completed_status(struct idxd_dmadev *idxd, uint16_t max_ops, enum rte_dma_
const uint16_t b_len = b_end - b_start;
if (b_len == 1) {/* not a batch */
*status = get_comp_status(&idxd->batch_comp_ring[idxd->batch_idx_read]);
+ if (status != RTE_DMA_STATUS_SUCCESSFUL)
+ idxd->stats.errors++;
idxd->ids_avail++;
idxd->ids_returned++;
idxd->batch_idx_read = next_batch;
@@ -297,6 +301,8 @@ batch_completed_status(struct idxd_dmadev *idxd, uint16_t max_ops, enum rte_dma_
struct idxd_completion *c = (void *)
&idxd->desc_ring[(b_start + ret) & idxd->desc_ring_mask];
status[ret] = (ret < bcount) ? get_comp_status(c) : RTE_DMA_STATUS_NOT_ATTEMPTED;
+ if (status[ret] != RTE_DMA_STATUS_SUCCESSFUL)
+ idxd->stats.errors++;
}
idxd->ids_avail = idxd->ids_returned += ret;
@@ -355,6 +361,7 @@ idxd_completed(void *dev_private, uint16_t qid __rte_unused, uint16_t max_ops,
ret += batch;
} while (batch > 0 && *has_error == false);
+ idxd->stats.completed += ret;
*last_idx = idxd->ids_returned - 1;
return ret;
}
@@ -371,6 +378,7 @@ idxd_completed_status(void *dev_private, uint16_t qid __rte_unused, uint16_t max
ret += batch;
} while (batch > 0);
+ idxd->stats.completed += ret;
*last_idx = idxd->ids_returned - 1;
return ret;
}
@@ -404,6 +412,25 @@ idxd_dump(const struct rte_dma_dev *dev, FILE *f)
return 0;
}
+int
+idxd_stats_get(const struct rte_dma_dev *dev, uint16_t vchan __rte_unused,
+ struct rte_dma_stats *stats, uint32_t stats_sz)
+{
+ struct idxd_dmadev *idxd = dev->fp_obj->dev_private;
+ if (stats_sz < sizeof(*stats))
+ return -EINVAL;
+ *stats = idxd->stats;
+ return 0;
+}
+
+int
+idxd_stats_reset(struct rte_dma_dev *dev, uint16_t vchan __rte_unused)
+{
+ struct idxd_dmadev *idxd = dev->fp_obj->dev_private;
+ idxd->stats = (struct rte_dma_stats){0};
+ return 0;
+}
+
int
idxd_info_get(const struct rte_dma_dev *dev, struct rte_dma_info *info, uint32_t size)
{
@@ -59,6 +59,8 @@ struct idxd_dmadev {
struct idxd_completion *batch_comp_ring;
unsigned short *batch_idx_ring; /* store where each batch ends */
+ struct rte_dma_stats stats;
+
rte_iova_t batch_iova; /* base address of the batch comp ring */
rte_iova_t desc_iova; /* base address of desc ring, needed for completions */
@@ -97,5 +99,8 @@ uint16_t idxd_completed(void *dev_private, uint16_t qid, uint16_t max_ops,
uint16_t idxd_completed_status(void *dev_private, uint16_t qid __rte_unused,
uint16_t max_ops, uint16_t *last_idx,
enum rte_dma_status_code *status);
+int idxd_stats_get(const struct rte_dma_dev *dev, uint16_t vchan,
+ struct rte_dma_stats *stats, uint32_t stats_sz);
+int idxd_stats_reset(struct rte_dma_dev *dev, uint16_t vchan);
#endif /* _IDXD_INTERNAL_H_ */
@@ -136,6 +136,8 @@ static const struct rte_dma_dev_ops idxd_pci_ops = {
.dev_configure = idxd_configure,
.vchan_setup = idxd_vchan_setup,
.dev_info_get = idxd_info_get,
+ .stats_get = idxd_stats_get,
+ .stats_reset = idxd_stats_reset,
.dev_start = idxd_pci_dev_start,
.dev_stop = idxd_pci_dev_stop,
};