-/* Copyright (c) 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
+/* Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
struct dpif_ipfix;
struct dpif_sflow;
struct mac_learning;
+struct mcast_snooping;
+struct xlate_cache;
struct xlate_recirc {
uint32_t recirc_id; /* !0 Use recirculation instead of output. */
uint8_t hash_alg; /* !0 Compute hash for recirc before. */
- uint32_t hash_bias; /* Compute hash for recirc before. */
+ uint32_t hash_basis; /* Compute hash for recirc before. */
};
struct xlate_out {
ofp_port_t nf_output_iface; /* Output interface index for NetFlow. */
mirror_mask_t mirrors; /* Bitmap of associated mirrors. */
- bool use_recirc; /* Should generate recirc? */
- struct xlate_recirc recirc; /* Information used for generating
- * recirculation actions */
uint64_t odp_actions_stub[256 / 8];
- struct ofpbuf odp_actions;
+ struct ofpbuf odp_actions_buf;
+ struct ofpbuf *odp_actions;
};
struct xlate_in {
* This is normally null so the client has to set it manually after
* calling xlate_in_init(). */
const struct dpif_flow_stats *resubmit_stats;
-};
-extern struct ovs_rwlock xlate_rwlock;
+ /* If nonnull, flow translation populates this cache with references to all
+ * modules that are affected by translation. This 'xlate_cache' may be
+ * passed to xlate_push_stats() to perform the same function as
+ * xlate_actions() without the full cost of translation.
+ *
+ * This is normally null so the client has to set it manually after
+ * calling xlate_in_init(). */
+ struct xlate_cache *xcache;
+
+ /* Allows callers to optionally supply their own buffer for the resulting
+ * odp_actions stored in xlate_out. If NULL, the default buffer will be
+ * used. */
+ struct ofpbuf *odp_actions;
+};
-void xlate_ofproto_set(struct ofproto_dpif *, const char *name,
- struct dpif *, struct rule_dpif *miss_rule,
- struct rule_dpif *no_packet_in_rule,
+void xlate_ofproto_set(struct ofproto_dpif *, const char *name, struct dpif *,
const struct mac_learning *, struct stp *,
+ struct rstp *, const struct mcast_snooping *,
const struct mbridge *, const struct dpif_sflow *,
const struct dpif_ipfix *, const struct netflow *,
- enum ofp_config_flags, bool forward_bpdu,
+ bool forward_bpdu,
bool has_in_band, bool enable_recirc,
bool variable_length_userdata,
- size_t mpls_label_stack_length)
- OVS_REQ_WRLOCK(xlate_rwlock);
-void xlate_remove_ofproto(struct ofproto_dpif *) OVS_REQ_WRLOCK(xlate_rwlock);
+ size_t mpls_label_stack_length,
+ bool masked_set_action);
+void xlate_remove_ofproto(struct ofproto_dpif *);
void xlate_bundle_set(struct ofproto_dpif *, struct ofbundle *,
const char *name, enum port_vlan_mode, int vlan,
unsigned long *trunks, bool use_priority_tags,
const struct bond *, const struct lacp *,
- bool floodable) OVS_REQ_WRLOCK(xlate_rwlock);
-void xlate_bundle_remove(struct ofbundle *) OVS_REQ_WRLOCK(xlate_rwlock);
+ bool floodable);
+void xlate_bundle_remove(struct ofbundle *);
void xlate_ofport_set(struct ofproto_dpif *, struct ofbundle *,
struct ofport_dpif *, ofp_port_t, odp_port_t,
const struct netdev *, const struct cfm *,
const struct bfd *, struct ofport_dpif *peer,
- int stp_port_no, const struct ofproto_port_queue *qdscp,
+ int stp_port_no,
+ const struct rstp_port *rstp_port,
+ const struct ofproto_port_queue *qdscp,
size_t n_qdscp, enum ofputil_port_config,
enum ofputil_port_state, bool is_tunnel,
- bool may_enable) OVS_REQ_WRLOCK(xlate_rwlock);
-void xlate_ofport_remove(struct ofport_dpif *) OVS_REQ_WRLOCK(xlate_rwlock);
-
-int xlate_receive(const struct dpif_backer *, struct ofpbuf *packet,
- const struct nlattr *key, size_t key_len,
- struct flow *, struct ofproto_dpif **, struct dpif_ipfix **,
- struct dpif_sflow **, struct netflow **,
- odp_port_t *odp_in_port)
- OVS_EXCLUDED(xlate_rwlock);
-
-void xlate_actions(struct xlate_in *, struct xlate_out *)
- OVS_EXCLUDED(xlate_rwlock);
+ bool may_enable);
+void xlate_ofport_remove(struct ofport_dpif *);
+
+struct ofproto_dpif * xlate_lookup_ofproto(const struct dpif_backer *,
+ const struct flow *,
+ ofp_port_t *ofp_in_port);
+int xlate_lookup(const struct dpif_backer *, const struct flow *,
+ struct ofproto_dpif **, struct dpif_ipfix **,
+ struct dpif_sflow **, struct netflow **,
+ ofp_port_t *ofp_in_port);
+
+void xlate_actions(struct xlate_in *, struct xlate_out *);
void xlate_in_init(struct xlate_in *, struct ofproto_dpif *,
- const struct flow *, struct rule_dpif *,
+ const struct flow *, ofp_port_t in_port, struct rule_dpif *,
uint16_t tcp_flags, const struct ofpbuf *packet);
void xlate_out_uninit(struct xlate_out *);
void xlate_actions_for_side_effects(struct xlate_in *);
int xlate_send_packet(const struct ofport_dpif *, struct ofpbuf *);
+struct xlate_cache *xlate_cache_new(void);
+void xlate_push_stats(struct xlate_cache *, const struct dpif_flow_stats *);
+void xlate_cache_clear(struct xlate_cache *);
+void xlate_cache_delete(struct xlate_cache *);
+
+void xlate_txn_start(void);
+void xlate_txn_commit(void);
+
#endif /* ofproto-dpif-xlate.h */
projects / cascardo / ovs.git / blobdiff