X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnx-match.h;h=6a57297cb781baddbcd5e170bd8a46b25db7c064;hb=f31282b9c152d5e993c8fe0068b7a4ed8c8d98c8;hp=a039225d8e2b9e9554ec301e87c6a400643db754;hpb=e0edde6fee279cdbbf3c179f5f50adaf0c7c7f1e;p=sliver-openvswitch.git diff --git a/lib/nx-match.h b/lib/nx-match.h index a039225d8..6a57297cb 100644 --- a/lib/nx-match.h +++ b/lib/nx-match.h @@ -21,13 +21,14 @@ #include #include #include "flow.h" -#include "openvswitch/types.h" #include "ofp-errors.h" +#include "openvswitch/types.h" -struct cls_rule; struct ds; -struct flow; +struct match; struct mf_subfield; +struct ofpact_reg_move; +struct ofpact_reg_load; struct ofpbuf; struct nx_action_reg_load; struct nx_action_reg_move; @@ -38,30 +39,49 @@ struct nx_action_reg_move; */ enum ofperr nx_pull_match(struct ofpbuf *, unsigned int match_len, - uint16_t priority, struct cls_rule *, + struct match *, ovs_be64 *cookie, ovs_be64 *cookie_mask); enum ofperr nx_pull_match_loose(struct ofpbuf *, unsigned int match_len, - uint16_t priority, struct cls_rule *, - ovs_be64 *cookie, ovs_be64 *cookie_mask); -int nx_put_match(struct ofpbuf *, const struct cls_rule *, + struct match *, ovs_be64 *cookie, + ovs_be64 *cookie_mask); +enum ofperr oxm_pull_match(struct ofpbuf *, struct match *); +enum ofperr oxm_pull_match_loose(struct ofpbuf *, struct match *); +int nx_put_match(struct ofpbuf *, const struct match *, ovs_be64 cookie, ovs_be64 cookie_mask); +int oxm_put_match(struct ofpbuf *, const struct match *); char *nx_match_to_string(const uint8_t *, unsigned int match_len); +char *oxm_match_to_string(const uint8_t *, unsigned int match_len); int nx_match_from_string(const char *, struct ofpbuf *); +int oxm_match_from_string(const char *, struct ofpbuf *); + +void nxm_parse_reg_move(struct ofpact_reg_move *, const char *); +void nxm_parse_reg_load(struct ofpact_reg_load *, const char *); -void nxm_parse_reg_move(struct nx_action_reg_move *, const char *); -void nxm_parse_reg_load(struct nx_action_reg_load *, const char *); +void nxm_format_reg_move(const struct ofpact_reg_move *, struct ds *); +void nxm_format_reg_load(const struct ofpact_reg_load *, struct ds *); -void nxm_format_reg_move(const struct nx_action_reg_move *, struct ds *); -void nxm_format_reg_load(const struct nx_action_reg_load *, struct ds *); +enum ofperr nxm_reg_move_from_openflow(const struct nx_action_reg_move *, + struct ofpbuf *ofpacts); +enum ofperr nxm_reg_load_from_openflow(const struct nx_action_reg_load *, + struct ofpbuf *ofpacts); +enum ofperr nxm_reg_load_from_openflow12_set_field( + const struct ofp12_action_set_field * oasf, struct ofpbuf *ofpacts); -enum ofperr nxm_check_reg_move(const struct nx_action_reg_move *, +enum ofperr nxm_reg_move_check(const struct ofpact_reg_move *, const struct flow *); -enum ofperr nxm_check_reg_load(const struct nx_action_reg_load *, +enum ofperr nxm_reg_load_check(const struct ofpact_reg_load *, const struct flow *); -void nxm_execute_reg_move(const struct nx_action_reg_move *, struct flow *); -void nxm_execute_reg_load(const struct nx_action_reg_load *, struct flow *); +void nxm_reg_move_to_nxast(const struct ofpact_reg_move *, + struct ofpbuf *openflow); +void nxm_reg_load_to_nxast(const struct ofpact_reg_load *, + struct ofpbuf *openflow); + +void nxm_execute_reg_move(const struct ofpact_reg_move *, struct flow *); +void nxm_execute_reg_load(const struct ofpact_reg_load *, struct flow *); +void nxm_reg_load(const struct mf_subfield *, uint64_t src_data, + struct flow *); int nxm_field_bytes(uint32_t header); int nxm_field_bits(uint32_t header); @@ -85,50 +105,7 @@ nxm_decode_n_bits(ovs_be16 ofs_nbits) { return (ntohs(ofs_nbits) & 0x3f) + 1; } - -void nxm_decode(struct mf_subfield *, ovs_be32 header, ovs_be16 ofs_nbits); -void nxm_decode_discrete(struct mf_subfield *, ovs_be32 header, - ovs_be16 ofs, ovs_be16 n_bits); -BUILD_ASSERT_DECL(FLOW_WC_SEQ == 10); -/* Upper bound on the length of an nx_match. The longest nx_match (an - * IPV6 neighbor discovery message using 5 registers) would be: - * - * header value mask total - * ------ ----- ---- ----- - * NXM_OF_IN_PORT 4 2 -- 6 - * NXM_OF_ETH_DST_W 4 6 6 16 - * NXM_OF_ETH_SRC 4 6 -- 10 - * NXM_OF_ETH_TYPE 4 2 -- 6 - * NXM_OF_VLAN_TCI 4 2 2 8 - * NXM_OF_IP_TOS 4 1 -- 5 - * NXM_NX_IP_ECN 4 1 -- 5 - * NXM_OF_IP_TTL 4 1 -- 5 - * NXM_NX_IP_FRAG 4 1 1 8 - * NXM_OF_IP_PROTO 4 2 -- 6 - * NXM_OF_IPV6_SRC_W 4 16 16 36 - * NXM_OF_IPV6_DST_W 4 16 16 36 - * NXM_OF_IPV6_LABEL 4 4 -- 8 - * NXM_OF_ICMP_TYPE 4 1 -- 5 - * NXM_OF_ICMP_CODE 4 1 -- 5 - * NXM_NX_ND_TARGET 4 16 16 36 - * NXM_NX_ND_SLL 4 6 -- 10 - * NXM_NX_REG_W(0) 4 4 4 12 - * NXM_NX_REG_W(1) 4 4 4 12 - * NXM_NX_REG_W(2) 4 4 4 12 - * NXM_NX_REG_W(3) 4 4 4 12 - * NXM_NX_REG_W(4) 4 4 4 12 - * NXM_NX_REG_W(5) 4 4 4 12 - * NXM_NX_REG_W(6) 4 4 4 12 - * NXM_NX_REG_W(7) 4 4 4 12 - * NXM_NX_TUN_ID_W 4 8 8 20 - * ------------------------------------------- - * total 327 - * - * So this value is conservative. - */ -#define NXM_MAX_LEN 400 - /* This is my guess at the length of a "typical" nx_match, for use in * predicting space requirements. */ #define NXM_TYPICAL_LEN 64