mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-03 07:45:30 +00:00
Code Issues Releases Wiki Activity

dpif-netdev: rename packet_batch

Browse Source 
Next patch introduces new structure named packet_batch. So
I am renaming it to packet_batch_per_flow.
This does not change any functionality.

Signed-off-by: Pravin B Shelar <pshelar@ovn.org>
Acked-by: Jesse Gross <jesse@kernel.org>
This commit is contained in:
Pravin B Shelar
2016-05-17 17:32:28 -07:00
parent b513ea342e
commit f7ce48110d
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/dpif-netdev.c
View File

@@ -327,8 +327,8 @@ struct dp_netdev_flow {
/* While processing a group of input packets, the datapath uses the next /* While processing a group of input packets, the datapath uses the next
* member to store a pointer to the output batch for the flow. It is * member to store a pointer to the output batch for the flow. It is
* reset after the batch has been sent out (See dp_netdev_queue_batches(), * reset after the batch has been sent out (See dp_netdev_queue_batches(),
* packet_batch_init() and packet_batch_execute()). */ * packet_batch_per_flow_init() and packet_batch_per_flow_execute()). */
struct packet_batch *batch; struct packet_batch_per_flow *batch;
/* Packet classification. */ /* Packet classification. */
struct dpcls_rule cr; /* In owning dp_netdev's 'cls'. */ struct dpcls_rule cr; /* In owning dp_netdev's 'cls'. */
@@ -3329,7 +3329,7 @@ dpif_netdev_packet_get_rss_hash(struct dp_packet *packet,
return hash; return hash;
} }
struct packet_batch { struct packet_batch_per_flow {
unsigned int packet_count; unsigned int packet_count;
unsigned int byte_count; unsigned int byte_count;
uint16_t tcp_flags; uint16_t tcp_flags;
@@ -3340,8 +3340,9 @@ struct packet_batch {
}; };
static inline void static inline void
packet_batch_update(struct packet_batch *batch, struct dp_packet *packet, packet_batch_per_flow_update(struct packet_batch_per_flow *batch,
const struct miniflow *mf) struct dp_packet *packet,
const struct miniflow *mf)
{ {
batch->tcp_flags |= miniflow_get_tcp_flags(mf); batch->tcp_flags |= miniflow_get_tcp_flags(mf);
batch->packets[batch->packet_count++] = packet; batch->packets[batch->packet_count++] = packet;
@@ -3349,7 +3350,8 @@ packet_batch_update(struct packet_batch *batch, struct dp_packet *packet,
} }
static inline void static inline void
packet_batch_init(struct packet_batch *batch, struct dp_netdev_flow *flow) packet_batch_per_flow_init(struct packet_batch_per_flow *batch,
struct dp_netdev_flow *flow)
{ {
flow->batch = batch; flow->batch = batch;
@@ -3360,9 +3362,9 @@ packet_batch_init(struct packet_batch *batch, struct dp_netdev_flow *flow)
} }
static inline void static inline void
packet_batch_execute(struct packet_batch *batch, packet_batch_per_flow_execute(struct packet_batch_per_flow *batch,
struct dp_netdev_pmd_thread *pmd, struct dp_netdev_pmd_thread *pmd,
long long now) long long now)
{ {
struct dp_netdev_actions *actions; struct dp_netdev_actions *actions;
struct dp_netdev_flow *flow = batch->flow; struct dp_netdev_flow *flow = batch->flow;
@@ -3379,16 +3381,16 @@ packet_batch_execute(struct packet_batch *batch,
static inline void static inline void
dp_netdev_queue_batches(struct dp_packet *pkt, dp_netdev_queue_batches(struct dp_packet *pkt,
struct dp_netdev_flow *flow, const struct miniflow *mf, struct dp_netdev_flow *flow, const struct miniflow *mf,
struct packet_batch *batches, size_t *n_batches) struct packet_batch_per_flow *batches, size_t *n_batches)
{ {
struct packet_batch *batch = flow->batch; struct packet_batch_per_flow *batch = flow->batch;
if (OVS_UNLIKELY(!batch)) { if (OVS_UNLIKELY(!batch)) {
batch = &batches[(*n_batches)++]; batch = &batches[(*n_batches)++];
packet_batch_init(batch, flow); packet_batch_per_flow_init(batch, flow);
} }
packet_batch_update(batch, pkt, mf); packet_batch_per_flow_update(batch, pkt, mf);
} }
/* Try to process all ('cnt') the 'packets' using only the exact match cache /* Try to process all ('cnt') the 'packets' using only the exact match cache
@@ -3405,7 +3407,7 @@ dp_netdev_queue_batches(struct dp_packet *pkt,
static inline size_t static inline size_t
emc_processing(struct dp_netdev_pmd_thread *pmd, struct dp_packet **packets, emc_processing(struct dp_netdev_pmd_thread *pmd, struct dp_packet **packets,
size_t cnt, struct netdev_flow_key *keys, size_t cnt, struct netdev_flow_key *keys,
struct packet_batch batches[], size_t *n_batches, struct packet_batch_per_flow batches[], size_t *n_batches,
bool md_is_valid, odp_port_t port_no) bool md_is_valid, odp_port_t port_no)
{ {
struct emc_cache *flow_cache = &pmd->flow_cache; struct emc_cache *flow_cache = &pmd->flow_cache;
@@ -3459,7 +3461,7 @@ static inline void
fast_path_processing(struct dp_netdev_pmd_thread *pmd, fast_path_processing(struct dp_netdev_pmd_thread *pmd,
struct dp_packet **packets, size_t cnt, struct dp_packet **packets, size_t cnt,
struct netdev_flow_key *keys, struct netdev_flow_key *keys,
struct packet_batch batches[], size_t *n_batches) struct packet_batch_per_flow batches[], size_t *n_batches)
{ {
#if !defined(__CHECKER__) && !defined(_WIN32) #if !defined(__CHECKER__) && !defined(_WIN32)
const size_t PKT_ARRAY_SIZE = cnt; const size_t PKT_ARRAY_SIZE = cnt;
@@ -3612,7 +3614,7 @@ dp_netdev_input__(struct dp_netdev_pmd_thread *pmd,
enum { PKT_ARRAY_SIZE = NETDEV_MAX_BURST }; enum { PKT_ARRAY_SIZE = NETDEV_MAX_BURST };
#endif #endif
struct netdev_flow_key keys[PKT_ARRAY_SIZE]; struct netdev_flow_key keys[PKT_ARRAY_SIZE];
struct packet_batch batches[PKT_ARRAY_SIZE]; struct packet_batch_per_flow batches[PKT_ARRAY_SIZE];
long long now = time_msec(); long long now = time_msec();
size_t newcnt, n_batches, i; size_t newcnt, n_batches, i;
@@ -3628,7 +3630,7 @@ dp_netdev_input__(struct dp_netdev_pmd_thread *pmd,
} }
for (i = 0; i < n_batches; i++) { for (i = 0; i < n_batches; i++) {
packet_batch_execute(&batches[i], pmd, now); packet_batch_per_flow_execute(&batches[i], pmd, now);
} }
} }