Change the interface to allow implementations to pass back a buffer, and
allow callers to specify which of actions, mask, and stats they wish to
receive. This will be used in the next commit.
Signed-off-by: Joe Stringer <joestrin...@nicira.com>
---
v4: Rebase against master.
v3: Set *bufp to NULL before calling ->flow_get().
Allocate the correct size for the buffer in dpif_netdev_flow_get().
Don't overwrite mask with actions in dpif_netdev_flow_get().
Remove unneeded *bufp = NULL in dpif_netdev_flow_get().
v2: First post.
---
lib/dpif-linux.c | 23 +++++++++++++----------
lib/dpif-netdev.c | 30 +++++++++++++++++++++++++++---
lib/dpif-provider.h | 21 ++++++++++++++++-----
lib/dpif.c | 49 +++++++++++++++++++++++++------------------------
lib/dpif.h | 3 ++-
5 files changed, 83 insertions(+), 43 deletions(-)
diff --git a/lib/dpif-linux.c b/lib/dpif-linux.c
index 0eac3e7..9e0aa29 100644
--- a/lib/dpif-linux.c
+++ b/lib/dpif-linux.c
@@ -1047,24 +1047,27 @@ dpif_linux_flow_get__(const struct dpif_linux *dpif,
static int
dpif_linux_flow_get(const struct dpif *dpif_,
const struct nlattr *key, size_t key_len,
- struct ofpbuf **actionsp, struct dpif_flow_stats *stats)
+ struct ofpbuf **bufp,
+ struct nlattr **maskp, size_t *mask_len,
+ struct nlattr **actionsp, size_t *actions_len,
+ struct dpif_flow_stats *stats)
{
const struct dpif_linux *dpif = dpif_linux_cast(dpif_);
struct dpif_linux_flow reply;
- struct ofpbuf *buf;
int error;
- error = dpif_linux_flow_get__(dpif, key, key_len, &reply, &buf);
+ error = dpif_linux_flow_get__(dpif, key, key_len, &reply, bufp);
if (!error) {
- if (stats) {
- dpif_linux_flow_get_stats(&reply, stats);
+ if (maskp) {
+ *maskp = CONST_CAST(struct nlattr *, reply.mask);
+ *mask_len = reply.mask_len;
}
if (actionsp) {
- ofpbuf_set_data(buf, CONST_CAST(struct nlattr *, reply.actions));
- ofpbuf_set_size(buf, reply.actions_len);
- *actionsp = buf;
- } else {
- ofpbuf_delete(buf);
+ *actionsp = CONST_CAST(struct nlattr *, reply.actions);
+ *actions_len = reply.actions_len;
+ }
+ if (stats) {
+ dpif_linux_flow_get_stats(&reply, stats);
}
}
return error;
diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
index b6d6b2e..974b5e1 100644
--- a/lib/dpif-netdev.c
+++ b/lib/dpif-netdev.c
@@ -1212,7 +1212,10 @@ dpif_netdev_flow_from_nlattrs(const struct nlattr *key,
uint32_t key_len,
static int
dpif_netdev_flow_get(const struct dpif *dpif,
const struct nlattr *nl_key, size_t nl_key_len,
- struct ofpbuf **actionsp, struct dpif_flow_stats *stats)
+ struct ofpbuf **bufp,
+ struct nlattr **maskp, size_t *mask_len,
+ struct nlattr **actionsp, size_t *actions_len,
+ struct dpif_flow_stats *stats)
{
struct dp_netdev *dp = get_dp_netdev(dpif);
struct dp_netdev_flow *netdev_flow;
@@ -1231,11 +1234,32 @@ dpif_netdev_flow_get(const struct dpif *dpif,
get_dpif_flow_stats(netdev_flow, stats);
}
- if (actionsp) {
+ if (maskp || actionsp) {
struct dp_netdev_actions *actions;
+ size_t len = 0;
actions = dp_netdev_flow_get_actions(netdev_flow);
- *actionsp = ofpbuf_clone_data(actions->actions, actions->size);
+ len += maskp ? sizeof(struct odputil_keybuf) : 0;
+ len += actionsp ? actions->size : 0;
+
+ *bufp = ofpbuf_new(len);
+ if (maskp) {
+ struct flow_wildcards wc;
+
+ minimask_expand(&netdev_flow->cr.match.mask, &wc);
+ odp_flow_key_from_mask(*bufp, &wc.masks, &netdev_flow->flow,
+ odp_to_u32(wc.masks.in_port.odp_port),
+ SIZE_MAX, true);
+ *maskp = ofpbuf_data(*bufp);
+ *mask_len = ofpbuf_size(*bufp);
+ }
+ if (actionsp) {
+ struct dp_netdev_actions *actions;
+
+ actions = dp_netdev_flow_get_actions(netdev_flow);
+ *actionsp = ofpbuf_put(*bufp, actions->actions, actions->size);
+ *actions_len = actions->size;
+ }
}
} else {
error = ENOENT;
diff --git a/lib/dpif-provider.h b/lib/dpif-provider.h
index b762ac0..2331cbf 100644
--- a/lib/dpif-provider.h
+++ b/lib/dpif-provider.h
@@ -246,16 +246,27 @@ struct dpif_class {
* Returns 0 if successful. If no flow matches, returns ENOENT. On other
* failure, returns a positive errno value.
*
- * If 'actionsp' is nonnull, then on success '*actionsp' must be set to an
- * ofpbuf owned by the caller that contains the Netlink attributes for the
- * flow's actions. The caller must free the ofpbuf (with ofpbuf_delete())
- * when it is no longer needed.
+ * On success, '*bufp' will be set to an ofpbuf owned by the caller that
+ * contains the response for 'maskp' and 'actionsp'. The caller must supply
+ * a valid pointer, and must free the ofpbuf (with ofpbuf_delete()) when it
+ * is no longer needed.
+ *
+ * If 'maskp' is nonnull, then on success '*maskp' will point to the
+ * Netlink attributes for the flow's mask, stored in '*bufp'. '*mask_len'
+ * will be set to the length of the mask attributes.
+ *
+ * If 'actionsp' is nonnull, then on success '*actionsp' will point to the
+ * Netlink attributes for the flow's actions, stored in '*bufp'.
+ * '*actions_len' will be set to the length of the actions attributes.
*
* If 'stats' is nonnull, then on success it must be updated with the
* flow's statistics. */
int (*flow_get)(const struct dpif *dpif,
const struct nlattr *key, size_t key_len,
- struct ofpbuf **actionsp, struct dpif_flow_stats *stats);
+ struct ofpbuf **bufp,
+ struct nlattr **maskp, size_t *mask_len,
+ struct nlattr **actionsp, size_t *acts_len,
+ struct dpif_flow_stats *stats);
/* Adds or modifies a flow in 'dpif'. The flow is specified by the Netlink
* attributes with types OVS_KEY_ATTR_* in the 'put->key_len' bytes
diff --git a/lib/dpif.c b/lib/dpif.c
index 2b6f36d..3e7467a 100644
--- a/lib/dpif.c
+++ b/lib/dpif.c
@@ -834,44 +834,45 @@ dpif_flow_flush(struct dpif *dpif)
* Returns 0 if successful. If no flow matches, returns ENOENT. On other
* failure, returns a positive errno value.
*
- * If 'actionsp' is nonnull, then on success '*actionsp' will be set to an
- * ofpbuf owned by the caller that contains the Netlink attributes for the
- * flow's actions. The caller must free the ofpbuf (with ofpbuf_delete()) when
+ * On success, '*bufp' will be set to an ofpbuf owned by the caller that
+ * contains the response for 'flow->mask' and 'flow->actions'. The caller must
+ * supply a valid pointer, and must free the ofpbuf (with ofpbuf_delete()) when
* it is no longer needed.
*
- * If 'stats' is nonnull, then on success it will be updated with the flow's
- * statistics. */
+ * On success, 'flow' will be populated with the mask, actions and stats for
+ * the datapath flow corresponding to 'key'. The mask and actions will point
+ * within '*bufp'.
+ */
int
dpif_flow_get(const struct dpif *dpif,
const struct nlattr *key, size_t key_len,
- struct ofpbuf **actionsp, struct dpif_flow_stats *stats)
+ struct ofpbuf **bufp, struct dpif_flow *flow)
{
int error;
+ struct nlattr *mask, *actions;
+ size_t mask_len, actions_len;
+ struct dpif_flow_stats stats;
COVERAGE_INC(dpif_flow_get);
- error = dpif->dpif_class->flow_get(dpif, key, key_len, actionsp, stats);
+ *bufp = NULL;
+ error = dpif->dpif_class->flow_get(dpif, key, key_len, bufp,
+ &mask, &mask_len,
+ &actions, &actions_len, &stats);
if (error) {
- if (actionsp) {
- *actionsp = NULL;
- }
- if (stats) {
- memset(stats, 0, sizeof *stats);
- }
+ memset(flow, 0, sizeof *flow);
+ ofpbuf_delete(*bufp);
+ } else {
+ flow->mask = mask;
+ flow->mask_len = mask_len;
+ flow->actions = actions;
+ flow->actions_len = actions_len;
+ flow->stats = stats;
}
if (should_log_flow_message(error)) {
- const struct nlattr *actions;
- size_t actions_len;
-
- if (!error && actionsp) {
- actions = ofpbuf_data(*actionsp);
- actions_len = ofpbuf_size(*actionsp);
- } else {
- actions = NULL;
- actions_len = 0;
- }
log_flow_message(dpif, error, "flow_get", key, key_len,
- NULL, 0, stats, actions, actions_len);
+ NULL, 0, &flow->stats,
+ flow->actions, flow->actions_len);
}
return error;
}
diff --git a/lib/dpif.h b/lib/dpif.h
index f080cde..94bcacc 100644
--- a/lib/dpif.h
+++ b/lib/dpif.h
@@ -405,6 +405,7 @@ struct flow;
struct nlattr;
struct sset;
struct dpif_class;
+struct dpif_flow;
int dp_register_provider(const struct dpif_class *);
int dp_unregister_provider(const char *type);
@@ -524,7 +525,7 @@ int dpif_flow_del(struct dpif *,
struct dpif_flow_stats *);
int dpif_flow_get(const struct dpif *,
const struct nlattr *key, size_t key_len,
- struct ofpbuf **actionsp, struct dpif_flow_stats *);
+ struct ofpbuf **, struct dpif_flow *);
/* Flow dumping interface
* ======================
--
1.7.10.4
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
