mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 06:15:47 +00:00
Code Issues Releases Wiki Activity

dpif-netdev: Move hash function out of the recirc action, into its own action

Browse Source 
Currently recirculation action can optionally compute hash. This patch
adds a hash action that is independent of the recirc action, which
no longer computes hash.  For megaflow bond with recirc, the output
to a bond port action will look like:

    hash(hash_l4(0)), recirc(<recirc_id>)

Obviously, when a recirculation application that does not depend on
hash value can just use the recirc action alone.

Signed-off-by: Andy Zhou <azhou@nicira.com>
Reviewed-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Acked-by: Pravin B Shelar <pshelar@nicira.com
This commit is contained in:
Andy Zhou
2014-04-08 18:42:39 -07:00
parent 40dd413d5b
commit 347bf289b3
6 changed files with 65 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/dpif-netdev.c
View File

@@ -2138,25 +2138,34 @@ dp_execute_cb(void *aux_, struct ofpbuf *packet,
break;
}
case OVS_ACTION_ATTR_HASH: {
const struct ovs_action_hash *hash_act;
uint32_t hash;
hash_act = nl_attr_get(a);
if (hash_act->hash_alg == OVS_HASH_ALG_L4) {
hash = flow_hash_symmetric_l4(aux->key, hash_act->hash_bias);
if (!hash) {
hash = 1; /* 0 is not valid */
}
} else {
VLOG_WARN("Unknown hash algorithm specified for the hash action.");
hash = 2;
}
md->dp_hash = hash;
break;
}
case OVS_ACTION_ATTR_RECIRC:
if (*depth < MAX_RECIRC_DEPTH) {
struct pkt_metadata recirc_md = *md;
struct ofpbuf *recirc_packet;
const struct ovs_action_recirc *act;
recirc_packet = may_steal ? packet : ofpbuf_clone(packet);
act = nl_attr_get(a);
recirc_md.recirc_id = act->recirc_id;
recirc_md.dp_hash = 0;
if (act->hash_alg == OVS_RECIRC_HASH_ALG_L4) {
recirc_md.dp_hash = flow_hash_symmetric_l4(aux->key,
act->hash_bias);
if (!recirc_md.dp_hash) {
recirc_md.dp_hash = 1; /* 0 is not valid */
}
}
recirc_md.recirc_id = nl_attr_get_u32(a);
(*depth)++;
dp_netdev_input(aux->dp, recirc_packet, &recirc_md);