This is a preliminary patch to add actving probing the mac binding
entries in table OFTABLE_MAC_BINDING.
Signed-off-by: Lorenzo Bianconi <[email protected]>
---
controller/lflow.c | 2 +-
lib/actions.c | 4 ++--
tests/ovn.at | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/controller/lflow.c b/controller/lflow.c
index 196539489..860869f55 100644
--- a/controller/lflow.c
+++ b/controller/lflow.c
@@ -1393,7 +1393,7 @@ consider_neighbor_flow(struct ovsdb_idl_index
*sbrec_port_binding_by_name,
}
ovs_be128 value;
memcpy(&value, &ip6, sizeof(value));
- match_set_xxreg(&get_arp_match, 0, ntoh128(value));
+ match_set_xxreg(&get_arp_match, 1, ntoh128(value));
match_set_dl_type(&lookup_arp_match, htons(ETH_TYPE_IPV6));
match_set_nw_proto(&lookup_arp_match, 58);
diff --git a/lib/actions.c b/lib/actions.c
index 7ec481e00..be1916e66 100644
--- a/lib/actions.c
+++ b/lib/actions.c
@@ -2235,7 +2235,7 @@ encode_GET_ND(const struct ovnact_get_mac_bind *get_mac,
const struct ovnact_encode_params *ep,
struct ofpbuf *ofpacts)
{
- encode_get_mac(get_mac, MFF_XXREG0, ep, ofpacts);
+ encode_get_mac(get_mac, MFF_XXREG1, ep, ofpacts);
}
static void
@@ -2494,7 +2494,7 @@ encode_LOOKUP_ND_IP(const struct
ovnact_lookup_mac_bind_ip *lookup_mac,
const struct ovnact_encode_params *ep,
struct ofpbuf *ofpacts)
{
- encode_lookup_mac_bind_ip(lookup_mac, MFF_XXREG0, ep, ofpacts);
+ encode_lookup_mac_bind_ip(lookup_mac, MFF_XXREG1, ep, ofpacts);
}
static void
diff --git a/tests/ovn.at b/tests/ovn.at
index 4bc6f1401..1889f5202 100644
--- a/tests/ovn.at
+++ b/tests/ovn.at
@@ -1586,10 +1586,10 @@ nd_na_router { eth.src = 12:34:56:78:9a:bc; nd.tll =
12:34:56:78:9a:bc; outport
# get_nd
get_nd(outport, ip6.dst);
- encodes as
push:NXM_NX_XXREG0[[]],push:NXM_NX_IPV6_DST[[]],pop:NXM_NX_XXREG0[[]],set_field:00:00:00:00:00:00->eth_dst,resubmit(,OFTABLE_MAC_BINDING),pop:NXM_NX_XXREG0[[]]
+ encodes as
push:NXM_NX_XXREG1[[]],push:NXM_NX_IPV6_DST[[]],pop:NXM_NX_XXREG1[[]],set_field:00:00:00:00:00:00->eth_dst,resubmit(,66),pop:NXM_NX_XXREG1[[]]
has prereqs eth.type == 0x86dd
get_nd(inport, xxreg0);
- encodes as
push:NXM_NX_REG15[[]],push:NXM_NX_REG14[[]],pop:NXM_NX_REG15[[]],set_field:00:00:00:00:00:00->eth_dst,resubmit(,OFTABLE_MAC_BINDING),pop:NXM_NX_REG15[[]]
+ encodes as
push:NXM_NX_REG15[[]],push:NXM_NX_XXREG1[[]],push:NXM_NX_XXREG0[[]],push:NXM_NX_REG14[[]],pop:NXM_NX_REG15[[]],pop:NXM_NX_XXREG1[[]],set_field:00:00:00:00:00:00->eth_dst,resubmit(,66),pop:NXM_NX_XXREG1[[]],pop:NXM_NX_REG15[[]]
get_nd;
Syntax error at `;' expecting `('.
get_nd();
@@ -1676,10 +1676,10 @@ reg0[[0]] = lookup_nd(inport, ip6.src, ip6.dst);
# lookup_nd_ip
reg2[[0]] = lookup_nd_ip(inport, ip6.dst);
- encodes as
push:NXM_NX_REG15[[]],push:NXM_NX_XXREG0[[]],push:NXM_NX_IPV6_DST[[]],push:NXM_NX_REG14[[]],pop:NXM_NX_REG15[[]],pop:NXM_NX_XXREG0[[]],push:NXM_OF_ETH_DST[[]],set_field:0/0x40->reg10,resubmit(,OFTABLE_MAC_BINDING),move:NXM_NX_REG10[[6]]->NXM_NX_XXREG0[[32]],pop:NXM_OF_ETH_DST[[]],pop:NXM_NX_XXREG0[[]],pop:NXM_NX_REG15[[]]
+ encodes as
push:NXM_NX_REG15[[]],push:NXM_NX_XXREG1[[]],push:NXM_NX_IPV6_DST[[]],push:NXM_NX_REG14[[]],pop:NXM_NX_REG15[[]],pop:NXM_NX_XXREG1[[]],push:NXM_OF_ETH_DST[[]],set_field:0/0x40->reg10,resubmit(,66),move:NXM_NX_REG10[[6]]->NXM_NX_XXREG0[[32]],pop:NXM_OF_ETH_DST[[]],pop:NXM_NX_XXREG1[[]],pop:NXM_NX_REG15[[]]
has prereqs eth.type == 0x86dd
reg3[[0]] = lookup_nd_ip(inport, nd.target);
- encodes as
push:NXM_NX_REG15[[]],push:NXM_NX_XXREG0[[]],push:NXM_NX_ND_TARGET[[]],push:NXM_NX_REG14[[]],pop:NXM_NX_REG15[[]],pop:NXM_NX_XXREG0[[]],push:NXM_OF_ETH_DST[[]],set_field:0/0x40->reg10,resubmit(,OFTABLE_MAC_BINDING),move:NXM_NX_REG10[[6]]->NXM_NX_XXREG0[[0]],pop:NXM_OF_ETH_DST[[]],pop:NXM_NX_XXREG0[[]],pop:NXM_NX_REG15[[]]
+ encodes as
push:NXM_NX_REG15[[]],push:NXM_NX_XXREG1[[]],push:NXM_NX_ND_TARGET[[]],push:NXM_NX_REG14[[]],pop:NXM_NX_REG15[[]],pop:NXM_NX_XXREG1[[]],push:NXM_OF_ETH_DST[[]],set_field:0/0x40->reg10,resubmit(,66),move:NXM_NX_REG10[[6]]->NXM_NX_XXREG0[[0]],pop:NXM_OF_ETH_DST[[]],pop:NXM_NX_XXREG1[[]],pop:NXM_NX_REG15[[]]
has prereqs (icmp6.type == 0x87 || icmp6.type == 0x88) && eth.type == 0x86dd && ip.proto == 0x3a && (eth.type == 0x800 ||
eth.type == 0x86dd) && icmp6.code == 0 && eth.type == 0x86dd && ip.proto == 0x3a && (eth.type == 0x800 || eth.type ==
0x86dd) && ip.ttl == 0xff && (eth.type == 0x800 || eth.type == 0x86dd)
lookup_nd_ip;