projects
/
cascardo
/
ovs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netdev-dpdk: Apply batch truncation API.
[cascardo/ovs.git]
/
lib
/
netdev-dpdk.c
diff --git
a/lib/netdev-dpdk.c
b/lib/netdev-dpdk.c
index
9a9ac45
..
8ca7af4
100644
(file)
--- a/
lib/netdev-dpdk.c
+++ b/
lib/netdev-dpdk.c
@@
-1411,6
+1411,8
@@
dpdk_do_tx_copy(struct netdev *netdev, int qid, struct dp_packet_batch *batch)
ovs_mutex_lock(&nonpmd_mempool_mutex);
}
ovs_mutex_lock(&nonpmd_mempool_mutex);
}
+ dp_packet_batch_apply_cutlen(batch);
+
for (i = 0; i < batch->count; i++) {
int size = dp_packet_size(batch->packets[i]);
for (i = 0; i < batch->count; i++) {
int size = dp_packet_size(batch->packets[i]);
@@
-1429,10
+1431,6
@@
dpdk_do_tx_copy(struct netdev *netdev, int qid, struct dp_packet_batch *batch)
break;
}
break;
}
- /* Cut the size so only the truncated size is copied. */
- size -= dp_packet_get_cutlen(batch->packets[i]);
- dp_packet_reset_cutlen(batch->packets[i]);
-
/* We have to do a copy for now */
memcpy(rte_pktmbuf_mtod(mbufs[newcnt], void *),
dp_packet_data(batch->packets[i]), size);
/* We have to do a copy for now */
memcpy(rte_pktmbuf_mtod(mbufs[newcnt], void *),
dp_packet_data(batch->packets[i]), size);
@@
-1506,12
+1504,11
@@
netdev_dpdk_send__(struct netdev_dpdk *dev, int qid,
unsigned int temp_cnt = 0;
int cnt = batch->count;
unsigned int temp_cnt = 0;
int cnt = batch->count;
+ dp_packet_batch_apply_cutlen(batch);
+
for (int i = 0; i < cnt; i++) {
int size = dp_packet_size(batch->packets[i]);
for (int i = 0; i < cnt; i++) {
int size = dp_packet_size(batch->packets[i]);
- size -= dp_packet_get_cutlen(batch->packets[i]);
- dp_packet_set_size(batch->packets[i], size);
-
if (OVS_UNLIKELY(size > dev->max_packet_len)) {
if (next_tx_idx != i) {
temp_cnt = i - next_tx_idx;
if (OVS_UNLIKELY(size > dev->max_packet_len)) {
if (next_tx_idx != i) {
temp_cnt = i - next_tx_idx;