#include "timeval.h"
#include "unaligned.h"
#include "util.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
VLOG_DEFINE_THIS_MODULE(dpif_netlink);
#ifdef _WIN32
size_t mask_len;
const struct nlattr *actions; /* OVS_FLOW_ATTR_ACTIONS. */
size_t actions_len;
+ ovs_u128 ufid; /* OVS_FLOW_ATTR_FLOW_ID. */
+ bool ufid_present; /* Is there a UFID? */
+ bool ufid_terse; /* Skip serializing key/mask/acts? */
const struct ovs_flow_stats *stats; /* OVS_FLOW_ATTR_STATS. */
const uint8_t *tcp_flags; /* OVS_FLOW_ATTR_TCP_FLAGS. */
const ovs_32aligned_u64 *used; /* OVS_FLOW_ATTR_USED. */
}
static void
-dpif_netlink_init_flow_get(const struct dpif_netlink *dpif,
- const struct nlattr *key, size_t key_len,
- struct dpif_netlink_flow *request)
+dpif_netlink_flow_init_ufid(struct dpif_netlink_flow *request,
+ const ovs_u128 *ufid, bool terse)
+{
+ if (ufid) {
+ request->ufid = *ufid;
+ request->ufid_present = true;
+ } else {
+ request->ufid_present = false;
+ }
+ request->ufid_terse = terse;
+}
+
+static void
+dpif_netlink_init_flow_get__(const struct dpif_netlink *dpif,
+ const struct nlattr *key, size_t key_len,
+ const ovs_u128 *ufid, bool terse,
+ struct dpif_netlink_flow *request)
{
dpif_netlink_flow_init(request);
request->cmd = OVS_FLOW_CMD_GET;
request->dp_ifindex = dpif->dp_ifindex;
request->key = key;
request->key_len = key_len;
+ dpif_netlink_flow_init_ufid(request, ufid, terse);
+}
+
+static void
+dpif_netlink_init_flow_get(const struct dpif_netlink *dpif,
+ const struct dpif_flow_get *get,
+ struct dpif_netlink_flow *request)
+{
+ dpif_netlink_init_flow_get__(dpif, get->key, get->key_len, get->ufid,
+ false, request);
}
static int
-dpif_netlink_flow_get(const struct dpif_netlink *dpif,
- const struct nlattr *key, size_t key_len,
- struct dpif_netlink_flow *reply, struct ofpbuf **bufp)
+dpif_netlink_flow_get__(const struct dpif_netlink *dpif,
+ const struct nlattr *key, size_t key_len,
+ const ovs_u128 *ufid, bool terse,
+ struct dpif_netlink_flow *reply, struct ofpbuf **bufp)
{
struct dpif_netlink_flow request;
- dpif_netlink_init_flow_get(dpif, key, key_len, &request);
+ dpif_netlink_init_flow_get__(dpif, key, key_len, ufid, terse, &request);
return dpif_netlink_flow_transact(&request, reply, bufp);
}
+static int
+dpif_netlink_flow_get(const struct dpif_netlink *dpif,
+ const struct dpif_netlink_flow *flow,
+ struct dpif_netlink_flow *reply, struct ofpbuf **bufp)
+{
+ return dpif_netlink_flow_get__(dpif, flow->key, flow->key_len,
+ flow->ufid_present ? &flow->ufid : NULL,
+ false, reply, bufp);
+}
+
static void
dpif_netlink_init_flow_put(struct dpif_netlink *dpif,
const struct dpif_flow_put *put,
request->key_len = put->key_len;
request->mask = put->mask;
request->mask_len = put->mask_len;
+ dpif_netlink_flow_init_ufid(request, put->ufid, false);
+
/* Ensure that OVS_FLOW_ATTR_ACTIONS will always be included. */
request->actions = (put->actions
? put->actions
}
static void
-dpif_netlink_init_flow_del(struct dpif_netlink *dpif,
- const struct dpif_flow_del *del,
- struct dpif_netlink_flow *request)
+dpif_netlink_init_flow_del__(struct dpif_netlink *dpif,
+ const struct nlattr *key, size_t key_len,
+ const ovs_u128 *ufid, bool terse,
+ struct dpif_netlink_flow *request)
{
dpif_netlink_flow_init(request);
request->cmd = OVS_FLOW_CMD_DEL;
request->dp_ifindex = dpif->dp_ifindex;
- request->key = del->key;
- request->key_len = del->key_len;
+ request->key = key;
+ request->key_len = key_len;
+ dpif_netlink_flow_init_ufid(request, ufid, terse);
+}
+
+static void
+dpif_netlink_init_flow_del(struct dpif_netlink *dpif,
+ const struct dpif_flow_del *del,
+ struct dpif_netlink_flow *request)
+{
+ return dpif_netlink_init_flow_del__(dpif, del->key, del->key_len,
+ del->ufid, del->terse, request);
}
struct dpif_netlink_flow_dump {
}
static struct dpif_flow_dump *
-dpif_netlink_flow_dump_create(const struct dpif *dpif_)
+dpif_netlink_flow_dump_create(const struct dpif *dpif_, bool terse)
{
const struct dpif_netlink *dpif = dpif_netlink_cast(dpif_);
struct dpif_netlink_flow_dump *dump;
dpif_netlink_flow_init(&request);
request.cmd = OVS_FLOW_CMD_GET;
request.dp_ifindex = dpif->dp_ifindex;
+ request.ufid_present = false;
+ request.ufid_terse = terse;
buf = ofpbuf_new(1024);
dpif_netlink_flow_to_ofpbuf(&request, buf);
nl_dump_start(&dump->nl_dump, NETLINK_GENERIC, buf);
ofpbuf_delete(buf);
atomic_init(&dump->status, 0);
+ dump->up.terse = terse;
return &dump->up;
}
dpif_flow->mask_len = datapath_flow->mask_len;
dpif_flow->actions = datapath_flow->actions;
dpif_flow->actions_len = datapath_flow->actions_len;
- dpif_flow_hash(dpif, datapath_flow->key, datapath_flow->key_len,
- &dpif_flow->ufid);
+ dpif_flow->ufid_present = datapath_flow->ufid_present;
+ if (datapath_flow->ufid_present) {
+ dpif_flow->ufid = datapath_flow->ufid;
+ dpif_flow->pmd_id = PMD_ID_NULL;
+ } else {
+ ovs_assert(datapath_flow->key && datapath_flow->key_len);
+ dpif_flow_hash(dpif, datapath_flow->key, datapath_flow->key_len,
+ &dpif_flow->ufid);
+ }
dpif_netlink_flow_get_stats(datapath_flow, &dpif_flow->stats);
}
break;
}
- if (datapath_flow.actions) {
- /* Common case: the flow includes actions. */
+ if (dump->up.terse || datapath_flow.actions) {
+ /* Common case: we don't want actions, or the flow includes
+ * actions. */
dpif_netlink_flow_to_dpif_flow(&dpif->dpif, &flows[n_flows++],
&datapath_flow);
} else {
/* Rare case: the flow does not include actions. Retrieve this
* individual flow again to get the actions. */
- error = dpif_netlink_flow_get(dpif, datapath_flow.key,
- datapath_flow.key_len,
+ error = dpif_netlink_flow_get(dpif, &datapath_flow,
&datapath_flow, &thread->nl_actions);
if (error == ENOENT) {
VLOG_DBG("dumped flow disappeared on get");
case DPIF_OP_FLOW_GET:
get = &op->u.flow_get;
- dpif_netlink_init_flow_get(dpif, get->key, get->key_len, &flow);
+ dpif_netlink_init_flow_get(dpif, get, &flow);
aux->txn.reply = get->buffer;
dpif_netlink_flow_to_ofpbuf(&flow, &aux->request);
break;
dpif_netlink_flow_from_ofpbuf(struct dpif_netlink_flow *flow,
const struct ofpbuf *buf)
{
- static const struct nl_policy ovs_flow_policy[] = {
- [OVS_FLOW_ATTR_KEY] = { .type = NL_A_NESTED },
+ static const struct nl_policy ovs_flow_policy[__OVS_FLOW_ATTR_MAX] = {
+ [OVS_FLOW_ATTR_KEY] = { .type = NL_A_NESTED, .optional = true },
[OVS_FLOW_ATTR_MASK] = { .type = NL_A_NESTED, .optional = true },
[OVS_FLOW_ATTR_ACTIONS] = { .type = NL_A_NESTED, .optional = true },
[OVS_FLOW_ATTR_STATS] = { NL_POLICY_FOR(struct ovs_flow_stats),
.optional = true },
[OVS_FLOW_ATTR_TCP_FLAGS] = { .type = NL_A_U8, .optional = true },
[OVS_FLOW_ATTR_USED] = { .type = NL_A_U64, .optional = true },
+ [OVS_FLOW_ATTR_UFID] = { .type = NL_A_UNSPEC, .optional = true,
+ .min_len = sizeof(ovs_u128) },
/* The kernel never uses OVS_FLOW_ATTR_CLEAR. */
/* The kernel never uses OVS_FLOW_ATTR_PROBE. */
+ /* The kernel never uses OVS_FLOW_ATTR_UFID_FLAGS. */
};
struct nlattr *a[ARRAY_SIZE(ovs_flow_policy)];
ARRAY_SIZE(ovs_flow_policy))) {
return EINVAL;
}
+ if (!a[OVS_FLOW_ATTR_KEY] && !a[OVS_FLOW_ATTR_UFID]) {
+ return EINVAL;
+ }
flow->nlmsg_flags = nlmsg->nlmsg_flags;
flow->dp_ifindex = ovs_header->dp_ifindex;
- flow->key = nl_attr_get(a[OVS_FLOW_ATTR_KEY]);
- flow->key_len = nl_attr_get_size(a[OVS_FLOW_ATTR_KEY]);
+ if (a[OVS_FLOW_ATTR_KEY]) {
+ flow->key = nl_attr_get(a[OVS_FLOW_ATTR_KEY]);
+ flow->key_len = nl_attr_get_size(a[OVS_FLOW_ATTR_KEY]);
+ }
+
+ if (a[OVS_FLOW_ATTR_UFID]) {
+ const ovs_u128 *ufid;
+ ufid = nl_attr_get_unspec(a[OVS_FLOW_ATTR_UFID],
+ nl_attr_get_size(a[OVS_FLOW_ATTR_UFID]));
+ flow->ufid = *ufid;
+ flow->ufid_present = true;
+ }
if (a[OVS_FLOW_ATTR_MASK]) {
flow->mask = nl_attr_get(a[OVS_FLOW_ATTR_MASK]);
flow->mask_len = nl_attr_get_size(a[OVS_FLOW_ATTR_MASK]);
ovs_header = ofpbuf_put_uninit(buf, sizeof *ovs_header);
ovs_header->dp_ifindex = flow->dp_ifindex;
- if (flow->key_len) {
- nl_msg_put_unspec(buf, OVS_FLOW_ATTR_KEY, flow->key, flow->key_len);
+ if (flow->ufid_present) {
+ nl_msg_put_unspec(buf, OVS_FLOW_ATTR_UFID, &flow->ufid,
+ sizeof flow->ufid);
}
-
- if (flow->mask_len) {
- nl_msg_put_unspec(buf, OVS_FLOW_ATTR_MASK, flow->mask, flow->mask_len);
+ if (flow->ufid_terse) {
+ nl_msg_put_u32(buf, OVS_FLOW_ATTR_UFID_FLAGS,
+ OVS_UFID_F_OMIT_KEY | OVS_UFID_F_OMIT_MASK
+ | OVS_UFID_F_OMIT_ACTIONS);
}
+ if (!flow->ufid_terse || !flow->ufid_present) {
+ if (flow->key_len) {
+ nl_msg_put_unspec(buf, OVS_FLOW_ATTR_KEY,
+ flow->key, flow->key_len);
+ }
- if (flow->actions || flow->actions_len) {
- nl_msg_put_unspec(buf, OVS_FLOW_ATTR_ACTIONS,
- flow->actions, flow->actions_len);
+ if (flow->mask_len) {
+ nl_msg_put_unspec(buf, OVS_FLOW_ATTR_MASK,
+ flow->mask, flow->mask_len);
+ }
+ if (flow->actions || flow->actions_len) {
+ nl_msg_put_unspec(buf, OVS_FLOW_ATTR_ACTIONS,
+ flow->actions, flow->actions_len);
+ }
}
/* We never need to send these to the kernel. */
projects / cascardo / ovs.git / blobdiff