#include "util.h"
#include "ovs-thread.h"
+/* Priority for internal rules created to handle recirculation */
+#define RECIRC_RULE_PRIORITY 20
+
union user_action_cookie;
struct dpif_flow_stats;
struct ofproto;
struct OVS_LOCKABLE rule_dpif;
struct OVS_LOCKABLE group_dpif;
-enum rule_dpif_lookup_verdict {
- RULE_DPIF_LOOKUP_VERDICT_MATCH, /* A match occurred. */
- RULE_DPIF_LOOKUP_VERDICT_CONTROLLER, /* A miss occurred and the packet
- * should be passed to
- * the controller. */
- RULE_DPIF_LOOKUP_VERDICT_DROP, /* A miss occurred and the packet
- * should be dropped. */
- RULE_DPIF_LOOKUP_VERDICT_DEFAULT, /* A miss occurred and the packet
- * should handled by the default
- * miss behaviour.
- * For pre-OF1.3 it should be
- * forwarded to the controller.
- * For OF1.3+ it should be
- * dropped. */
-};
-
-/* For lock annotation below only. */
-extern struct ovs_rwlock xlate_rwlock;
+/* Number of implemented OpenFlow tables. */
+enum { N_TABLES = 255 };
+enum { TBL_INTERNAL = N_TABLES - 1 }; /* Used for internal hidden rules. */
+BUILD_ASSERT_DECL(N_TABLES >= 2 && N_TABLES <= 255);
/* Ofproto-dpif -- DPIF based ofproto implementation.
*
size_t ofproto_dpif_get_max_mpls_depth(const struct ofproto_dpif *);
bool ofproto_dpif_get_enable_recirc(const struct ofproto_dpif *);
-
-uint8_t rule_dpif_lookup(struct ofproto_dpif *, struct flow *,
- struct flow_wildcards *, struct rule_dpif **rule,
- bool take_ref);
-
-enum rule_dpif_lookup_verdict rule_dpif_lookup_from_table(struct ofproto_dpif *,
- const struct flow *,
- struct flow_wildcards *,
- bool force_controller_on_miss,
- uint8_t *table_id,
- struct rule_dpif **rule,
- bool take_ref);
+bool ofproto_dpif_get_enable_ufid(struct dpif_backer *backer);
+
+struct rule_dpif *rule_dpif_lookup(struct ofproto_dpif *, struct flow *,
+ struct flow_wildcards *, bool take_ref,
+ const struct dpif_flow_stats *,
+ uint8_t *table_id);
+
+struct rule_dpif *rule_dpif_lookup_from_table(struct ofproto_dpif *,
+ struct flow *,
+ struct flow_wildcards *,
+ bool take_ref,
+ const struct dpif_flow_stats *,
+ uint8_t *table_id,
+ ofp_port_t in_port,
+ bool may_packet_in,
+ bool honor_table_miss);
+
+/* If 'recirc_id' is set, starts looking up from internal table for
+ * post recirculation flows or packets. Otherwise, starts from table 0. */
+static inline uint8_t
+rule_dpif_lookup_get_init_table_id(const struct flow *flow)
+{
+ return flow->recirc_id ? TBL_INTERNAL : 0;
+}
static inline void rule_dpif_ref(struct rule_dpif *);
static inline void rule_dpif_unref(struct rule_dpif *);
bool table_is_internal(uint8_t table_id);
const struct rule_actions *rule_dpif_get_actions(const struct rule_dpif *);
+uint32_t rule_dpif_get_recirc_id(struct rule_dpif *);
+void rule_set_recirc_id(struct rule *, uint32_t id);
ovs_be64 rule_dpif_get_flow_cookie(const struct rule_dpif *rule);
struct rule_dpif *no_packet_in_rule,
struct rule_dpif **rule, bool take_ref);
+void group_dpif_credit_stats(struct group_dpif *,
+ struct ofputil_bucket *,
+ const struct dpif_flow_stats *);
bool group_dpif_lookup(struct ofproto_dpif *ofproto, uint32_t group_id,
struct group_dpif **group);
-void group_dpif_release(struct group_dpif *group);
-
void group_dpif_get_buckets(const struct group_dpif *group,
- const struct list **buckets);
+ const struct ovs_list **buckets);
enum ofp11_group_type group_dpif_get_type(const struct group_dpif *group);
bool ofproto_has_vlan_splinters(const struct ofproto_dpif *);
ofp_port_t vsp_realdev_to_vlandev(const struct ofproto_dpif *,
ofp_port_t realdev_ofp_port,
ovs_be16 vlan_tci);
-bool vsp_adjust_flow(const struct ofproto_dpif *, struct flow *);
+bool vsp_adjust_flow(const struct ofproto_dpif *, struct flow *,
+ struct dp_packet *packet);
int ofproto_dpif_execute_actions(struct ofproto_dpif *, const struct flow *,
struct rule_dpif *, const struct ofpact *,
- size_t ofpacts_len, struct ofpbuf *)
- OVS_EXCLUDED(xlate_rwlock);
+ size_t ofpacts_len, struct dp_packet *);
void ofproto_dpif_send_packet_in(struct ofproto_dpif *,
struct ofproto_packet_in *);
bool ofproto_dpif_wants_packet_in_on_miss(struct ofproto_dpif *);
-int ofproto_dpif_send_packet(const struct ofport_dpif *, struct ofpbuf *);
+int ofproto_dpif_send_packet(const struct ofport_dpif *, struct dp_packet *);
void ofproto_dpif_flow_mod(struct ofproto_dpif *, struct ofputil_flow_mod *);
struct rule_dpif *ofproto_dpif_refresh_rule(struct rule_dpif *);
* nested, data path implementation limits the number of recirculation executed
* to prevent unreasonable nesting depth or infinite loop.
*
- * Both flow fields and the RECIRC action are exposed as open flow fields via
+ * Both flow fields and the RECIRC action are exposed as OpenFlow fields via
* Nicira extensions.
*
* Post recirculation flow
* ------------------------
*
- * At the open flow level, post recirculation rules are always hidden from the
+ * At the OpenFlow level, post recirculation rules are always hidden from the
* controller. They are installed in table 254 which is set up as a hidden
* table during boot time. Those rules are managed by the local user space
* program only.
* Post recirculation data path flows are managed like other data path flows.
* They are created on demand. Miss handling, stats collection and revalidation
* work the same way as regular flows.
+ *
+ * If the bridge which originates the recirculation is different from the bridge
+ * that receives the post recirculation packet (e.g. when patch port is used),
+ * the packet will be processed directly by the recirculation bridge with
+ * in_port set to OFPP_NONE. Admittedly, doing this limits the recirculation
+ * bridge from matching on in_port of post recirculation packets, and will be
+ * fixed in the near future.
+ *
+ * TODO: Always restore the correct in_port.
+ *
*/
+struct ofproto_dpif *ofproto_dpif_recirc_get_ofproto(const struct dpif_backer *ofproto,
+ uint32_t recirc_id);
uint32_t ofproto_dpif_alloc_recirc_id(struct ofproto_dpif *ofproto);
void ofproto_dpif_free_recirc_id(struct ofproto_dpif *ofproto, uint32_t recirc_id);
int ofproto_dpif_add_internal_flow(struct ofproto_dpif *,
- struct match *, int priority,
+ const struct match *, int priority,
+ uint16_t idle_timeout,
const struct ofpbuf *ofpacts,
struct rule **rulep);
int ofproto_dpif_delete_internal_flow(struct ofproto_dpif *, struct match *,
int priority);
-
-/* Number of implemented OpenFlow tables. */
-enum { N_TABLES = 255 };
-enum { TBL_INTERNAL = N_TABLES - 1 }; /* Used for internal hidden rules. */
-BUILD_ASSERT_DECL(N_TABLES >= 2 && N_TABLES <= 255);
-
\f
/* struct rule_dpif has struct rule as it's first member. */
#define RULE_CAST(RULE) ((struct rule *)RULE)
+#define GROUP_CAST(GROUP) ((struct ofgroup *)GROUP)
+
+static inline struct group_dpif* group_dpif_ref(struct group_dpif *group)
+{
+ if (group) {
+ ofproto_group_ref(GROUP_CAST(group));
+ }
+ return group;
+}
+
+static inline void group_dpif_unref(struct group_dpif *group)
+{
+ if (group) {
+ ofproto_group_unref(GROUP_CAST(group));
+ }
+}
static inline void rule_dpif_ref(struct rule_dpif *rule)
{
}
}
+static inline bool rule_dpif_try_ref(struct rule_dpif *rule)
+{
+ if (rule) {
+ return ofproto_rule_try_ref(RULE_CAST(rule));
+ }
+ return false;
+}
+
+
static inline void rule_dpif_unref(struct rule_dpif *rule)
{
if (rule) {
#undef RULE_CAST
+bool ovs_native_tunneling_is_on(struct ofproto_dpif *ofproto);
#endif /* ofproto-dpif.h */
projects / cascardo / ovs.git / blobdiff