Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
avf: tx dequeue optimizations
[vpp.git]
/
src
/
plugins
/
avf
/
avf.h
diff --git
a/src/plugins/avf/avf.h
b/src/plugins/avf/avf.h
index
030f05e
..
60d49e7
100644
(file)
--- a/
src/plugins/avf/avf.h
+++ b/
src/plugins/avf/avf.h
@@
-28,10
+28,15
@@
#define AVF_RXD_ERROR_SHIFT 19
#define AVF_RXD_PTYPE_SHIFT 30
#define AVF_RXD_LEN_SHIFT 38
#define AVF_RXD_ERROR_SHIFT 19
#define AVF_RXD_PTYPE_SHIFT 30
#define AVF_RXD_LEN_SHIFT 38
+#define AVF_RX_MAX_DESC_IN_CHAIN 5
#define AVF_RXD_ERROR_IPE (1ULL << (AVF_RXD_ERROR_SHIFT + 3))
#define AVF_RXD_ERROR_L4E (1ULL << (AVF_RXD_ERROR_SHIFT + 4))
#define AVF_RXD_ERROR_IPE (1ULL << (AVF_RXD_ERROR_SHIFT + 3))
#define AVF_RXD_ERROR_L4E (1ULL << (AVF_RXD_ERROR_SHIFT + 4))
+#define AVF_TXD_CMD(x) (1 << (x + 4))
+#define AVF_TXD_CMD_EOP AVF_TXD_CMD(0)
+#define AVF_TXD_CMD_RS AVF_TXD_CMD(1)
+#define AVF_TXD_CMD_RSV AVF_TXD_CMD(2)
#define foreach_avf_device_flags \
_(0, INITIALIZED, "initialized") \
#define foreach_avf_device_flags \
_(0, INITIALIZED, "initialized") \
@@
-109,6
+114,7
@@
typedef struct
avf_tx_desc_t *descs;
u32 *bufs;
u16 n_enqueued;
avf_tx_desc_t *descs;
u32 *bufs;
u16 n_enqueued;
+ u16 *rs_slots;
} avf_txq_t;
typedef struct
} avf_txq_t;
typedef struct
@@
-167,10
+173,18
@@
enum
AVF_PROCESS_EVENT_AQ_INT = 3,
} avf_process_event_t;
AVF_PROCESS_EVENT_AQ_INT = 3,
} avf_process_event_t;
+typedef struct
+{
+ u64 qw1s[AVF_RX_MAX_DESC_IN_CHAIN - 1];
+ u32 buffers[AVF_RX_MAX_DESC_IN_CHAIN - 1];
+} avf_rx_tail_t;
+
typedef struct
{
CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
typedef struct
{
CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
- u32 *to_free;
+ vlib_buffer_t *bufs[AVF_RX_VECTOR_SZ];
+ u64 qw1s[AVF_RX_VECTOR_SZ];
+ avf_rx_tail_t tails[AVF_RX_VECTOR_SZ];
vlib_buffer_t buffer_template;
} avf_per_thread_data_t;
vlib_buffer_t buffer_template;
} avf_per_thread_data_t;
@@
-270,11
+284,23
@@
avf_reg_flush (avf_device_t * ad)
asm volatile ("":::"memory");
}
asm volatile ("":::"memory");
}
+static_always_inline int
+avf_rxd_is_not_eop (avf_rx_desc_t * d)
+{
+ return (d->qword[1] & AVF_RXD_STATUS_EOP) == 0;
+}
+
+static_always_inline int
+avf_rxd_is_not_dd (avf_rx_desc_t * d)
+{
+ return (d->qword[1] & AVF_RXD_STATUS_DD) == 0;
+}
+
typedef struct
{
u32 next_index;
u32 hw_if_index;
typedef struct
{
u32 next_index;
u32 hw_if_index;
- u64 qw1;
+ u64 qw1
s[AVF_RX_MAX_DESC_IN_CHAIN]
;
} avf_input_trace_t;
#define foreach_avf_tx_func_error \
} avf_input_trace_t;
#define foreach_avf_tx_func_error \