Rather than having the xstats as fields inside the main driver structure,
create a separate structure type for them.
As part of the change, when updating the stats functions referring to the
stats by the old path, we can simplify them to use the id to directly index
into the stats structure, making the code shorter and simpler.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Reviewed-by: Kevin Laatz <kevin.laatz@intel.com>
Acked-by: Radu Nicolau <radu.nicolau@intel.com>
---
drivers/raw/ioat/ioat_rawdev.c | 40 +++++++-------------------
drivers/raw/ioat/rte_ioat_rawdev_fns.h | 30 ++++++++++++-------
2 files changed, 29 insertions(+), 41 deletions(-)
@@ -132,16 +132,14 @@ ioat_xstats_get(const struct rte_rawdev *dev, const unsigned int ids[],
uint64_t values[], unsigned int n)
{
const struct rte_ioat_rawdev *ioat = dev->dev_private;
+ const uint64_t *stats = (const void *)&ioat->xstats;
unsigned int i;
for (i = 0; i < n; i++) {
- switch (ids[i]) {
- case 0: values[i] = ioat->enqueue_failed; break;
- case 1: values[i] = ioat->enqueued; break;
- case 2: values[i] = ioat->started; break;
- case 3: values[i] = ioat->completed; break;
- default: values[i] = 0; break;
- }
+ if (ids[i] < sizeof(ioat->xstats)/sizeof(*stats))
+ values[i] = stats[ids[i]];
+ else
+ values[i] = 0;
}
return n;
}
@@ -167,35 +165,17 @@ static int
ioat_xstats_reset(struct rte_rawdev *dev, const uint32_t *ids, uint32_t nb_ids)
{
struct rte_ioat_rawdev *ioat = dev->dev_private;
+ uint64_t *stats = (void *)&ioat->xstats;
unsigned int i;
if (!ids) {
- ioat->enqueue_failed = 0;
- ioat->enqueued = 0;
- ioat->started = 0;
- ioat->completed = 0;
+ memset(&ioat->xstats, 0, sizeof(ioat->xstats));
return 0;
}
- for (i = 0; i < nb_ids; i++) {
- switch (ids[i]) {
- case 0:
- ioat->enqueue_failed = 0;
- break;
- case 1:
- ioat->enqueued = 0;
- break;
- case 2:
- ioat->started = 0;
- break;
- case 3:
- ioat->completed = 0;
- break;
- default:
- IOAT_PMD_WARN("Invalid xstat id - cannot reset value");
- break;
- }
- }
+ for (i = 0; i < nb_ids; i++)
+ if (ids[i] < sizeof(ioat->xstats)/sizeof(*stats))
+ stats[ids[i]] = 0;
return 0;
}
@@ -49,17 +49,31 @@ enum rte_ioat_dev_type {
RTE_IDXD_DEV,
};
+/**
+ * @internal
+ * some statistics for tracking, if added/changed update xstats fns
+ */
+struct rte_ioat_xstats {
+ uint64_t enqueue_failed;
+ uint64_t enqueued;
+ uint64_t started;
+ uint64_t completed;
+};
+
/**
* @internal
* Structure representing an IOAT device instance
*/
struct rte_ioat_rawdev {
+ /* common fields at the top - match those in rte_idxd_rawdev */
enum rte_ioat_dev_type type;
+ struct rte_ioat_xstats xstats;
+
struct rte_rawdev *rawdev;
const struct rte_memzone *mz;
const struct rte_memzone *desc_mz;
- volatile uint16_t *doorbell;
+ volatile uint16_t *doorbell __rte_cache_aligned;
phys_addr_t status_addr;
phys_addr_t ring_addr;
@@ -72,12 +86,6 @@ struct rte_ioat_rawdev {
unsigned short next_read;
unsigned short next_write;
- /* some statistics for tracking, if added/changed update xstats fns*/
- uint64_t enqueue_failed __rte_cache_aligned;
- uint64_t enqueued;
- uint64_t started;
- uint64_t completed;
-
/* to report completions, the device will write status back here */
volatile uint64_t status __rte_cache_aligned;
@@ -209,7 +217,7 @@ __ioat_enqueue_copy(int dev_id, phys_addr_t src, phys_addr_t dst,
struct rte_ioat_generic_hw_desc *desc;
if (space == 0) {
- ioat->enqueue_failed++;
+ ioat->xstats.enqueue_failed++;
return 0;
}
@@ -228,7 +236,7 @@ __ioat_enqueue_copy(int dev_id, phys_addr_t src, phys_addr_t dst,
(int64_t)src_hdl);
rte_prefetch0(&ioat->desc_ring[ioat->next_write & mask]);
- ioat->enqueued++;
+ ioat->xstats.enqueued++;
return 1;
}
@@ -261,7 +269,7 @@ __ioat_perform_ops(int dev_id)
.control.completion_update = 1;
rte_compiler_barrier();
*ioat->doorbell = ioat->next_write;
- ioat->started = ioat->enqueued;
+ ioat->xstats.started = ioat->xstats.enqueued;
}
/**
@@ -328,7 +336,7 @@ __ioat_completed_ops(int dev_id, uint8_t max_copies,
end:
ioat->next_read = read;
- ioat->completed += count;
+ ioat->xstats.completed += count;
return count;
}