@@ -2356,7 +2356,8 @@ mark_to_flow_associate(const uint32_t mark, struct dp_netdev_flow *flow)
hash_int(mark, 0));
flow->mark = mark;
- VLOG_DBG("Associated dp_netdev flow %p with mark %u\n", flow, mark);
+ VLOG_DBG("Associated dp_netdev flow %p with mark %u mega_ufid "UUID_FMT
+ "\n",flow, mark, UUID_ARGS((struct uuid *) &flow->mega_ufid));
}
static bool
@@ -2405,7 +2406,8 @@ mark_to_flow_disassociate(struct dp_netdev_pmd_thread *pmd,
}
flow_mark_free(mark);
- VLOG_DBG("Freed flow mark %u\n", mark);
+ VLOG_DBG("Freed flow mark %u mega_ufid "UUID_FMT"\n", mark,
+ UUID_ARGS((struct uuid *) &flow->mega_ufid));
megaflow_to_mark_disassociate(&flow->mega_ufid);
}
@@ -2612,8 +2614,9 @@ dp_netdev_flow_offload_main(void *data OVS_UNUSED)
OVS_NOT_REACHED();
}
- VLOG_DBG("%s to %s netdev flow\n",
- ret == 0 ? "succeed" : "failed", op);
+ VLOG_DBG("%s to %s netdev flow "UUID_FMT"\n",
+ ret == 0 ? "succeed" : "failed", op,
+ UUID_ARGS((struct uuid *) &offload->flow->mega_ufid));
dp_netdev_free_flow_offload(offload);
ovsrcu_quiesce();
}
@@ -3484,6 +3487,8 @@ dp_netdev_flow_add(struct dp_netdev_pmd_thread *pmd,
ds_put_cstr(&ds, "flow_add: ");
odp_format_ufid(ufid, &ds);
+ ds_put_cstr(&ds, " mega_");
+ odp_format_ufid(&flow->mega_ufid, &ds);
ds_put_cstr(&ds, " ");
odp_flow_format(key_buf.data, key_buf.size,
mask_buf.data, mask_buf.size,
@@ -13,6 +13,7 @@ strip_timers () {
strip_xout () {
sed '
+ s/mega_ufid:[-0-9a-f]* //
s/ufid:[-0-9a-f]* //
s/used:[0-9]*\.[0-9]*/used:0.0/
s/actions:.*/actions: <del>/
@@ -23,6 +24,7 @@ strip_xout () {
strip_xout_keep_actions () {
sed '
+ s/mega_ufid:[-0-9a-f]* //
s/ufid:[-0-9a-f]* //
s/used:[0-9]*\.[0-9]*/used:0.0/
s/packets:[0-9]*/packets:0/
@@ -131,7 +131,8 @@ strip_duration () {
# Strips 'ufid:...' from output, to make it easier to compare.
# (ufids are random.)
strip_ufid () {
- sed 's/ufid:[[-0-9a-f]]* //'
+ sed 's/mega_ufid:[[-0-9a-f]]* //
+ s/ufid:[[-0-9a-f]]* //'
}
m4_divert_pop([PREPARE_TESTS])