| Message ID | 1505913181-82547-2-git-send-email-bhanuprakash.bodireddy@intel.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Use packet batch macro and APIs. | expand |
I applied the patch to dpdk_merge here
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_darball_ovs_commits_dpdk-5Fmerge&d=DwIGaQ&c=uilaK90D4TOVoH58JNXRgQ&r=BVhFA09CGX7JQ5Ih-uZnsw&m=A2_FCacqbp2moAo3HGFlTuxsjONUGhlN42OBcAuQQ6w&s=b6btPKhgvOFr2GOUYvktND6kaC6jc3fXI-mXfvNgXOU&e=
On 9/20/17, 6:23 AM, "ovs-dev-bounces@openvswitch.org on behalf of Bhanuprakash Bodireddy" <ovs-dev-bounces@openvswitch.org on behalf of bhanuprakash.bodireddy@intel.com> wrote:
Use DP_PACKET_BATCH_FOR_EACH macro in conntrack_execute().
Signed-off-by: Bhanuprakash Bodireddy <bhanuprakash.bodireddy@intel.com>
---
lib/conntrack.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/lib/conntrack.c b/lib/conntrack.c
index 419cb1d..019092e 100644
--- a/lib/conntrack.c
+++ b/lib/conntrack.c
@@ -1141,17 +1141,16 @@ conntrack_execute(struct conntrack *ct, struct dp_packet_batch *pkt_batch,
long long now)
{
- struct dp_packet **pkts = pkt_batch->packets;
- size_t cnt = pkt_batch->count;
+ struct dp_packet *packet;
struct conn_lookup_ctx ctx;
- for (size_t i = 0; i < cnt; i++) {
- if (!conn_key_extract(ct, pkts[i], dl_type, &ctx, zone)) {
- pkts[i]->md.ct_state = CS_INVALID;
- write_ct_md(pkts[i], zone, NULL, NULL, NULL);
+ DP_PACKET_BATCH_FOR_EACH (packet, pkt_batch) {
+ if (!conn_key_extract(ct, packet, dl_type, &ctx, zone)) {
+ packet->md.ct_state = CS_INVALID;
+ write_ct_md(packet, zone, NULL, NULL, NULL);
continue;
}
- process_one(ct, pkts[i], &ctx, zone, force, commit,
+ process_one(ct, packet, &ctx, zone, force, commit,
now, setmark, setlabel, nat_action_info, helper);
}
--
2.4.11
_______________________________________________
dev mailing list
dev@openvswitch.org
https://urldefense.proofpoint.com/v2/url?u=https-3A__mail.openvswitch.org_mailman_listinfo_ovs-2Ddev&d=DwICAg&c=uilaK90D4TOVoH58JNXRgQ&r=BVhFA09CGX7JQ5Ih-uZnsw&m=q8-gpQXMxEbh9WudRKXV5HwtGGIG8vZgpFFaXLt3e1I&s=fgGyh0weaRmmZb4WOYDAX8QD6X3LZtVuwWXpEj7lBfU&e=
diff --git a/lib/conntrack.c b/lib/conntrack.c index 419cb1d..019092e 100644 --- a/lib/conntrack.c +++ b/lib/conntrack.c @@ -1141,17 +1141,16 @@ conntrack_execute(struct conntrack *ct, struct dp_packet_batch *pkt_batch, long long now) { - struct dp_packet **pkts = pkt_batch->packets; - size_t cnt = pkt_batch->count; + struct dp_packet *packet; struct conn_lookup_ctx ctx; - for (size_t i = 0; i < cnt; i++) { - if (!conn_key_extract(ct, pkts[i], dl_type, &ctx, zone)) { - pkts[i]->md.ct_state = CS_INVALID; - write_ct_md(pkts[i], zone, NULL, NULL, NULL); + DP_PACKET_BATCH_FOR_EACH (packet, pkt_batch) { + if (!conn_key_extract(ct, packet, dl_type, &ctx, zone)) { + packet->md.ct_state = CS_INVALID; + write_ct_md(packet, zone, NULL, NULL, NULL); continue; } - process_one(ct, pkts[i], &ctx, zone, force, commit, + process_one(ct, packet, &ctx, zone, force, commit, now, setmark, setlabel, nat_action_info, helper); }
Use DP_PACKET_BATCH_FOR_EACH macro in conntrack_execute(). Signed-off-by: Bhanuprakash Bodireddy <bhanuprakash.bodireddy@intel.com> --- lib/conntrack.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)