git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/bnxt: fix ULP context list deadlock
[dpdk.git]
/
examples
/
vhost
/
ioat.c
diff --git
a/examples/vhost/ioat.c
b/examples/vhost/ioat.c
index
60b73be
..
9aeeb12
100644
(file)
--- a/
examples/vhost/ioat.c
+++ b/
examples/vhost/ioat.c
@@
-113,7
+113,7
@@
open_ioat(const char *value)
goto out;
}
rte_rawdev_start(dev_id);
goto out;
}
rte_rawdev_start(dev_id);
- cb_tracker[dev_id].ioat_space = IOAT_RING_SIZE;
+ cb_tracker[dev_id].ioat_space = IOAT_RING_SIZE
- 1
;
dma_info->nr++;
i++;
}
dma_info->nr++;
i++;
}
@@
-122,40
+122,36
@@
out:
return ret;
}
return ret;
}
-
u
int32_t
+int32_t
ioat_transfer_data_cb(int vid, uint16_t queue_id,
ioat_transfer_data_cb(int vid, uint16_t queue_id,
- struct rte_vhost_
async_desc *descs
,
+ struct rte_vhost_
iov_iter *iov_iter
,
struct rte_vhost_async_status *opaque_data, uint16_t count)
{
struct rte_vhost_async_status *opaque_data, uint16_t count)
{
- uint32_t i_
desc
;
+ uint32_t i_
iter
;
uint16_t dev_id = dma_bind[vid].dmas[queue_id * 2 + VIRTIO_RXQ].dev_id;
uint16_t dev_id = dma_bind[vid].dmas[queue_id * 2 + VIRTIO_RXQ].dev_id;
- struct rte_vhost_iov_iter *src = NULL;
- struct rte_vhost_iov_iter *dst = NULL;
+ struct rte_vhost_iov_iter *iter = NULL;
unsigned long i_seg;
unsigned short mask = MAX_ENQUEUED_SIZE - 1;
unsigned short write = cb_tracker[dev_id].next_write;
if (!opaque_data) {
unsigned long i_seg;
unsigned short mask = MAX_ENQUEUED_SIZE - 1;
unsigned short write = cb_tracker[dev_id].next_write;
if (!opaque_data) {
- for (i_desc = 0; i_desc < count; i_desc++) {
- src = descs[i_desc].src;
- dst = descs[i_desc].dst;
+ for (i_iter = 0; i_iter < count; i_iter++) {
+ iter = iov_iter + i_iter;
i_seg = 0;
i_seg = 0;
- if (cb_tracker[dev_id].ioat_space <
src
->nr_segs)
+ if (cb_tracker[dev_id].ioat_space <
iter
->nr_segs)
break;
break;
- while (i_seg <
src
->nr_segs) {
+ while (i_seg <
iter
->nr_segs) {
rte_ioat_enqueue_copy(dev_id,
rte_ioat_enqueue_copy(dev_id,
- (uintptr_t)(src->iov[i_seg].iov_base)
- + src->offset,
- (uintptr_t)(dst->iov[i_seg].iov_base)
- + dst->offset,
- src->iov[i_seg].iov_len,
+ (uintptr_t)(iter->iov[i_seg].src_addr),
+ (uintptr_t)(iter->iov[i_seg].dst_addr),
+ iter->iov[i_seg].len,
0,
0);
i_seg++;
}
write &= mask;
0,
0);
i_seg++;
}
write &= mask;
- cb_tracker[dev_id].size_track[write] =
src
->nr_segs;
- cb_tracker[dev_id].ioat_space -=
src
->nr_segs;
+ cb_tracker[dev_id].size_track[write] =
iter
->nr_segs;
+ cb_tracker[dev_id].ioat_space -=
iter
->nr_segs;
write++;
}
} else {
write++;
}
} else {
@@
-165,10
+161,10
@@
ioat_transfer_data_cb(int vid, uint16_t queue_id,
/* ring the doorbell */
rte_ioat_perform_ops(dev_id);
cb_tracker[dev_id].next_write = write;
/* ring the doorbell */
rte_ioat_perform_ops(dev_id);
cb_tracker[dev_id].next_write = write;
- return i_
desc
;
+ return i_
iter
;
}
}
-
u
int32_t
+int32_t
ioat_check_completed_copies_cb(int vid, uint16_t queue_id,
struct rte_vhost_async_status *opaque_data,
uint16_t max_packets)
ioat_check_completed_copies_cb(int vid, uint16_t queue_id,
struct rte_vhost_async_status *opaque_data,
uint16_t max_packets)
@@
-183,7
+179,7
@@
ioat_check_completed_copies_cb(int vid, uint16_t queue_id,
uint16_t dev_id = dma_bind[vid].dmas[queue_id * 2
+ VIRTIO_RXQ].dev_id;
uint16_t dev_id = dma_bind[vid].dmas[queue_id * 2
+ VIRTIO_RXQ].dev_id;
- n_seg = rte_ioat_completed_ops(dev_id, 255, dump, dump);
+ n_seg = rte_ioat_completed_ops(dev_id, 255,
NULL, NULL,
dump, dump);
if (n_seg < 0) {
RTE_LOG(ERR,
VHOST_DATA,
if (n_seg < 0) {
RTE_LOG(ERR,
VHOST_DATA,