X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fdpif-linux.c;h=c5628b7eb6d8abfd45a0412a44575f98a574be25;hb=d0c0b87f1ed1668499b8f4f770022ff3af225172;hp=4ddd4647660c62928c978074e4f71daf7c4cb88f;hpb=a8d9304d121f56af0e6f02677342933579be3277;p=openvswitch diff --git a/lib/dpif-linux.c b/lib/dpif-linux.c index 4ddd4647..c5628b7e 100644 --- a/lib/dpif-linux.c +++ b/lib/dpif-linux.c @@ -77,9 +77,8 @@ struct dpif_linux_dp { /* Attributes. */ const char *name; /* OVS_DP_ATTR_NAME. */ - uint32_t upcall_pid; /* OVS_DP_UPCALL_PID. */ + const uint32_t *upcall_pid; /* OVS_DP_UPCALL_PID. */ struct ovs_dp_stats stats; /* OVS_DP_ATTR_STATS. */ - enum ovs_frag_handling ipv4_frags; /* OVS_DP_ATTR_IPV4_FRAGS. */ }; static void dpif_linux_dp_init(struct dpif_linux_dp *); @@ -102,9 +101,9 @@ struct dpif_linux_flow { /* Attributes. * - * The 'stats' and 'used' members point to 64-bit data that might only be - * aligned on 32-bit boundaries, so get_unaligned_u64() should be used to - * access their values. + * The 'stats' member points to 64-bit data that might only be aligned on + * 32-bit boundaries, so get_unaligned_u64() should be used to access its + * values. * * If 'actions' is nonnull then OVS_FLOW_ATTR_ACTIONS will be included in * the Netlink version of the command, even if actions_len is zero. */ @@ -112,10 +111,9 @@ struct dpif_linux_flow { size_t key_len; const struct nlattr *actions; /* OVS_FLOW_ATTR_ACTIONS. */ size_t actions_len; - uint32_t upcall_pid; /* OVS_FLOW_ATTR_UPCALL_PID. */ const struct ovs_flow_stats *stats; /* OVS_FLOW_ATTR_STATS. */ const uint8_t *tcp_flags; /* OVS_FLOW_ATTR_TCP_FLAGS. */ - const uint64_t *used; /* OVS_FLOW_ATTR_USED. */ + const ovs_32aligned_u64 *used; /* OVS_FLOW_ATTR_USED. */ bool clear; /* OVS_FLOW_ATTR_CLEAR. */ }; @@ -124,7 +122,7 @@ static int dpif_linux_flow_from_ofpbuf(struct dpif_linux_flow *, const struct ofpbuf *); static void dpif_linux_flow_to_ofpbuf(const struct dpif_linux_flow *, struct ofpbuf *); -static int dpif_linux_flow_transact(const struct dpif_linux_flow *request, +static int dpif_linux_flow_transact(struct dpif_linux_flow *request, struct dpif_linux_flow *reply, struct ofpbuf **bufp); static void dpif_linux_flow_get_stats(const struct dpif_linux_flow *, @@ -168,9 +166,9 @@ static int dpif_linux_init(void); static void open_dpif(const struct dpif_linux_dp *, struct dpif **); static bool dpif_linux_nln_parse(struct ofpbuf *, void *); static void dpif_linux_port_changed(const void *vport, void *dpif); -static uint32_t get_upcall_pid_port(struct dpif_linux *, uint32_t port); -static uint32_t get_upcall_pid_flow(struct dpif_linux *, - const struct nlattr *key, size_t key_len); +static uint32_t dpif_linux_port_get_pid__(const struct dpif *, + uint16_t port_no, + enum dpif_upcall_type); static void dpif_linux_vport_to_ofpbuf(const struct dpif_linux_vport *, struct ofpbuf *); @@ -236,6 +234,7 @@ dpif_linux_open(const struct dpif_class *class OVS_UNUSED, const char *name, { struct dpif_linux_dp dp_request, dp; struct ofpbuf *buf; + uint32_t upcall_pid; int error; error = dpif_linux_init(); @@ -245,7 +244,13 @@ dpif_linux_open(const struct dpif_class *class OVS_UNUSED, const char *name, /* Create or look up datapath. */ dpif_linux_dp_init(&dp_request); - dp_request.cmd = create ? OVS_DP_CMD_NEW : OVS_DP_CMD_GET; + if (create) { + dp_request.cmd = OVS_DP_CMD_NEW; + upcall_pid = 0; + dp_request.upcall_pid = &upcall_pid; + } else { + dp_request.cmd = OVS_DP_CMD_GET; + } dp_request.name = name; error = dpif_linux_dp_transact(&dp_request, &dp, &buf); if (error) { @@ -341,7 +346,6 @@ dpif_linux_get_stats(const struct dpif *dpif_, struct dpif_dp_stats *stats) error = dpif_linux_dp_get(dpif_, &dp, &buf); if (!error) { - stats->n_frags = dp.stats.n_frags; stats->n_hit = dp.stats.n_hit; stats->n_missed = dp.stats.n_missed; stats->n_lost = dp.stats.n_lost; @@ -351,34 +355,6 @@ dpif_linux_get_stats(const struct dpif *dpif_, struct dpif_dp_stats *stats) return error; } -static int -dpif_linux_get_drop_frags(const struct dpif *dpif_, bool *drop_fragsp) -{ - struct dpif_linux_dp dp; - struct ofpbuf *buf; - int error; - - error = dpif_linux_dp_get(dpif_, &dp, &buf); - if (!error) { - *drop_fragsp = dp.ipv4_frags == OVS_DP_FRAG_DROP; - ofpbuf_delete(buf); - } - return error; -} - -static int -dpif_linux_set_drop_frags(struct dpif *dpif_, bool drop_frags) -{ - struct dpif_linux *dpif = dpif_linux_cast(dpif_); - struct dpif_linux_dp dp; - - dpif_linux_dp_init(&dp); - dp.cmd = OVS_DP_CMD_SET; - dp.dp_ifindex = dpif->dp_ifindex; - dp.ipv4_frags = drop_frags ? OVS_DP_FRAG_DROP : OVS_DP_FRAG_ZERO; - return dpif_linux_dp_transact(&dp, NULL, NULL); -} - static int dpif_linux_port_add(struct dpif *dpif_, struct netdev *netdev, uint16_t *port_nop) @@ -415,16 +391,18 @@ dpif_linux_port_add(struct dpif *dpif_, struct netdev *netdev, /* Loop until we find a port that isn't used. */ do { + uint32_t upcall_pid; + request.port_no = dpif_linux_pop_port(dpif); - request.upcall_pid = get_upcall_pid_port(dpif, request.port_no); + upcall_pid = dpif_linux_port_get_pid__(dpif_, request.port_no, + DPIF_UC_MISS); + request.upcall_pid = &upcall_pid; error = dpif_linux_vport_transact(&request, &reply, &buf); if (!error) { *port_nop = reply.port_no; - VLOG_DBG("%s: assigning port %"PRIu32" to netlink " - "pid %"PRIu32, - dpif_name(dpif_), request.port_no, - request.upcall_pid); + VLOG_DBG("%s: assigning port %"PRIu32" to netlink pid %"PRIu32, + dpif_name(dpif_), request.port_no, upcall_pid); } ofpbuf_delete(buf); } while (request.port_no != UINT32_MAX @@ -499,6 +477,26 @@ dpif_linux_get_max_ports(const struct dpif *dpif OVS_UNUSED) return 1024; } +static uint32_t +dpif_linux_port_get_pid__(const struct dpif *dpif_, uint16_t port_no, + enum dpif_upcall_type upcall_type) +{ + struct dpif_linux *dpif = dpif_linux_cast(dpif_); + + if (!(dpif->listen_mask & (1u << upcall_type))) { + return 0; + } else { + int idx = port_no & (N_UPCALL_SOCKS - 1); + return nl_sock_pid(dpif->upcall_socks[idx]); + } +} + +static uint32_t +dpif_linux_port_get_pid(const struct dpif *dpif, uint16_t port_no) +{ + return dpif_linux_port_get_pid__(dpif, port_no, DPIF_UC_ACTION); +} + static int dpif_linux_flow_flush(struct dpif *dpif_) { @@ -659,31 +657,43 @@ dpif_linux_flow_get(const struct dpif *dpif_, return error; } +static void +dpif_linux_init_flow_put(struct dpif *dpif_, enum dpif_flow_put_flags flags, + const struct nlattr *key, size_t key_len, + const struct nlattr *actions, size_t actions_len, + struct dpif_linux_flow *request) +{ + static struct nlattr dummy_action; + + struct dpif_linux *dpif = dpif_linux_cast(dpif_); + + dpif_linux_flow_init(request); + request->cmd = (flags & DPIF_FP_CREATE + ? OVS_FLOW_CMD_NEW : OVS_FLOW_CMD_SET); + request->dp_ifindex = dpif->dp_ifindex; + request->key = key; + request->key_len = key_len; + /* Ensure that OVS_FLOW_ATTR_ACTIONS will always be included. */ + request->actions = actions ? actions : &dummy_action; + request->actions_len = actions_len; + if (flags & DPIF_FP_ZERO_STATS) { + request->clear = true; + } + request->nlmsg_flags = flags & DPIF_FP_MODIFY ? 0 : NLM_F_CREATE; +} + static int dpif_linux_flow_put(struct dpif *dpif_, enum dpif_flow_put_flags flags, const struct nlattr *key, size_t key_len, const struct nlattr *actions, size_t actions_len, struct dpif_flow_stats *stats) { - struct dpif_linux *dpif = dpif_linux_cast(dpif_); struct dpif_linux_flow request, reply; - struct nlattr dummy_action; struct ofpbuf *buf; int error; - dpif_linux_flow_init(&request); - request.cmd = flags & DPIF_FP_CREATE ? OVS_FLOW_CMD_NEW : OVS_FLOW_CMD_SET; - request.dp_ifindex = dpif->dp_ifindex; - request.key = key; - request.key_len = key_len; - /* Ensure that OVS_FLOW_ATTR_ACTIONS will always be included. */ - request.actions = actions ? actions : &dummy_action; - request.actions_len = actions_len; - request.upcall_pid = get_upcall_pid_flow(dpif, key, key_len); - if (flags & DPIF_FP_ZERO_STATS) { - request.clear = true; - } - request.nlmsg_flags = flags & DPIF_FP_MODIFY ? 0 : NLM_F_CREATE; + dpif_linux_init_flow_put(dpif_, flags, key, key_len, actions, actions_len, + &request); error = dpif_linux_flow_transact(&request, stats ? &reply : NULL, stats ? &buf : NULL); @@ -810,20 +820,19 @@ dpif_linux_flow_dump_done(const struct dpif *dpif OVS_UNUSED, void *state_) return error; } -static int -dpif_linux_execute__(int dp_ifindex, uint32_t upcall_pid, - const struct nlattr *key, size_t key_len, - const struct nlattr *actions, size_t actions_len, - const struct ofpbuf *packet) +static struct ofpbuf * +dpif_linux_encode_execute(int dp_ifindex, + const struct nlattr *key, size_t key_len, + const struct nlattr *actions, size_t actions_len, + const struct ofpbuf *packet) { struct ovs_header *execute; struct ofpbuf *buf; - int error; buf = ofpbuf_new(128 + actions_len + packet->size); nl_msg_put_genlmsghdr(buf, 0, ovs_packet_family, NLM_F_REQUEST, - OVS_PACKET_CMD_EXECUTE, 1); + OVS_PACKET_CMD_EXECUTE, OVS_PACKET_VERSION); execute = ofpbuf_put_uninit(buf, sizeof *execute); execute->dp_ifindex = dp_ifindex; @@ -831,10 +840,24 @@ dpif_linux_execute__(int dp_ifindex, uint32_t upcall_pid, nl_msg_put_unspec(buf, OVS_PACKET_ATTR_PACKET, packet->data, packet->size); nl_msg_put_unspec(buf, OVS_PACKET_ATTR_KEY, key, key_len); nl_msg_put_unspec(buf, OVS_PACKET_ATTR_ACTIONS, actions, actions_len); - nl_msg_put_u32(buf, OVS_PACKET_ATTR_UPCALL_PID, upcall_pid); - error = nl_sock_transact(genl_sock, buf, NULL); - ofpbuf_delete(buf); + return buf; +} + +static int +dpif_linux_execute__(int dp_ifindex, const struct nlattr *key, size_t key_len, + const struct nlattr *actions, size_t actions_len, + const struct ofpbuf *packet) +{ + struct ofpbuf *request; + int error; + + request = dpif_linux_encode_execute(dp_ifindex, + key, key_len, actions, actions_len, + packet); + error = nl_sock_transact(genl_sock, request, NULL); + ofpbuf_delete(request); + return error; } @@ -845,107 +868,123 @@ dpif_linux_execute(struct dpif *dpif_, const struct ofpbuf *packet) { struct dpif_linux *dpif = dpif_linux_cast(dpif_); - uint32_t upcall_pid = get_upcall_pid_flow(dpif, key, key_len); - return dpif_linux_execute__(dpif->dp_ifindex, upcall_pid, key, key_len, + return dpif_linux_execute__(dpif->dp_ifindex, key, key_len, actions, actions_len, packet); } -static int -dpif_linux_recv_get_mask(const struct dpif *dpif_, int *listen_mask) +static void +dpif_linux_operate(struct dpif *dpif_, union dpif_op **ops, size_t n_ops) { struct dpif_linux *dpif = dpif_linux_cast(dpif_); - *listen_mask = dpif->listen_mask; - return 0; -} - -static uint32_t -get_upcall_pid_port__(struct dpif_linux *dpif, uint32_t port) -{ - int idx = port & (N_UPCALL_SOCKS - 1); - return nl_sock_pid(dpif->upcall_socks[idx]); -} + struct nl_transaction **txnsp; + struct nl_transaction *txns; + size_t i; + + txns = xmalloc(n_ops * sizeof *txns); + for (i = 0; i < n_ops; i++) { + struct nl_transaction *txn = &txns[i]; + union dpif_op *op = ops[i]; + + if (op->type == DPIF_OP_FLOW_PUT) { + struct dpif_flow_put *put = &op->flow_put; + struct dpif_linux_flow request; + + dpif_linux_init_flow_put(dpif_, put->flags, put->key, put->key_len, + put->actions, put->actions_len, + &request); + if (put->stats) { + request.nlmsg_flags |= NLM_F_ECHO; + } + txn->request = ofpbuf_new(1024); + dpif_linux_flow_to_ofpbuf(&request, txn->request); + } else if (op->type == DPIF_OP_EXECUTE) { + struct dpif_execute *execute = &op->execute; + + txn->request = dpif_linux_encode_execute( + dpif->dp_ifindex, execute->key, execute->key_len, + execute->actions, execute->actions_len, execute->packet); + } else { + NOT_REACHED(); + } + } -static uint32_t -get_upcall_pid_port(struct dpif_linux *dpif, uint32_t port) -{ - if (!(dpif->listen_mask & (1u << DPIF_UC_MISS))) { - return 0; + txnsp = xmalloc(n_ops * sizeof *txnsp); + for (i = 0; i < n_ops; i++) { + txnsp[i] = &txns[i]; } - return get_upcall_pid_port__(dpif, port); -} + nl_sock_transact_multiple(genl_sock, txnsp, n_ops); -static uint32_t -get_upcall_pid_flow(struct dpif_linux *dpif, - const struct nlattr *key, size_t key_len) -{ - const struct nlattr *nla; - uint32_t port; + free(txnsp); - if (!(dpif->listen_mask & (1u << DPIF_UC_ACTION))) { - return 0; - } + for (i = 0; i < n_ops; i++) { + struct nl_transaction *txn = &txns[i]; + union dpif_op *op = ops[i]; - nla = nl_attr_find__(key, key_len, OVS_KEY_ATTR_IN_PORT); - if (nla) { - port = nl_attr_get_u32(nla); - } else { - port = random_uint32(); + if (op->type == DPIF_OP_FLOW_PUT) { + struct dpif_flow_put *put = &op->flow_put; + int error = txn->error; + + if (!error && put->stats) { + struct dpif_linux_flow reply; + + error = dpif_linux_flow_from_ofpbuf(&reply, txn->reply); + if (!error) { + dpif_linux_flow_get_stats(&reply, put->stats); + } + } + put->error = error; + } else if (op->type == DPIF_OP_EXECUTE) { + struct dpif_execute *execute = &op->execute; + + execute->error = txn->error; + } else { + NOT_REACHED(); + } + + ofpbuf_delete(txn->request); + ofpbuf_delete(txn->reply); } + free(txns); +} - return get_upcall_pid_port__(dpif, port); +static int +dpif_linux_recv_get_mask(const struct dpif *dpif_, int *listen_mask) +{ + struct dpif_linux *dpif = dpif_linux_cast(dpif_); + *listen_mask = dpif->listen_mask; + return 0; } static void -set_upcall_pids(struct dpif_linux *dpif) +set_upcall_pids(struct dpif *dpif_) { - struct dpif_port port; + struct dpif_linux *dpif = dpif_linux_cast(dpif_); struct dpif_port_dump port_dump; - struct dpif_flow_dump flow_dump; - const struct nlattr *key; - size_t key_len; + struct dpif_port port; int error; DPIF_PORT_FOR_EACH (&port, &port_dump, &dpif->dpif) { + uint32_t upcall_pid = dpif_linux_port_get_pid__(dpif_, port.port_no, + DPIF_UC_MISS); struct dpif_linux_vport vport_request; dpif_linux_vport_init(&vport_request); vport_request.cmd = OVS_VPORT_CMD_SET; vport_request.dp_ifindex = dpif->dp_ifindex; vport_request.port_no = port.port_no; - vport_request.upcall_pid = get_upcall_pid_port(dpif, - vport_request.port_no); + vport_request.upcall_pid = &upcall_pid; error = dpif_linux_vport_transact(&vport_request, NULL, NULL); if (!error) { - VLOG_DBG("%s: assigning port %"PRIu32" to netlink " - "pid %"PRIu32, + VLOG_DBG("%s: assigning port %"PRIu32" to netlink pid %"PRIu32, dpif_name(&dpif->dpif), vport_request.port_no, - vport_request.upcall_pid); + upcall_pid); } else { VLOG_WARN_RL(&error_rl, "%s: failed to set upcall pid on port: %s", dpif_name(&dpif->dpif), strerror(error)); } } - - dpif_flow_dump_start(&flow_dump, &dpif->dpif); - while (dpif_flow_dump_next(&flow_dump, &key, &key_len, - NULL, NULL, NULL)) { - struct dpif_linux_flow flow_request; - - dpif_linux_flow_init(&flow_request); - flow_request.cmd = OVS_FLOW_CMD_SET; - flow_request.dp_ifindex = dpif->dp_ifindex; - flow_request.key = key; - flow_request.key_len = key_len; - flow_request.upcall_pid = get_upcall_pid_flow(dpif, key, key_len); - error = dpif_linux_flow_transact(&flow_request, NULL, NULL); - if (error) { - VLOG_WARN_RL(&error_rl, "%s: failed to set upcall pid on flow: %s", - dpif_name(&dpif->dpif), strerror(error)); - } - } - dpif_flow_dump_done(&flow_dump); } static int @@ -973,7 +1012,7 @@ dpif_linux_recv_set_mask(struct dpif *dpif_, int listen_mask) } dpif->listen_mask = listen_mask; - set_upcall_pids(dpif); + set_upcall_pids(dpif_); return 0; } @@ -1137,13 +1176,12 @@ const struct dpif_class dpif_linux_class = { dpif_linux_run, dpif_linux_wait, dpif_linux_get_stats, - dpif_linux_get_drop_frags, - dpif_linux_set_drop_frags, dpif_linux_port_add, dpif_linux_port_del, dpif_linux_port_query_by_number, dpif_linux_port_query_by_name, dpif_linux_get_max_ports, + dpif_linux_port_get_pid, dpif_linux_port_dump_start, dpif_linux_port_dump_next, dpif_linux_port_dump_done, @@ -1157,6 +1195,7 @@ const struct dpif_class dpif_linux_class = { dpif_linux_flow_dump_next, dpif_linux_flow_dump_done, dpif_linux_execute, + dpif_linux_operate, dpif_linux_recv_get_mask, dpif_linux_recv_set_mask, dpif_linux_queue_to_priority, @@ -1244,7 +1283,7 @@ dpif_linux_vport_send(int dp_ifindex, uint32_t port_no, ofpbuf_use_stack(&actions, &action, sizeof action); nl_msg_put_u32(&actions, OVS_ACTION_ATTR_OUTPUT, port_no); - return dpif_linux_execute__(dp_ifindex, 0, key.data, key.size, + return dpif_linux_execute__(dp_ifindex, key.data, key.size, actions.data, actions.size, &packet); } @@ -1299,7 +1338,6 @@ dpif_linux_vport_from_ofpbuf(struct dpif_linux_vport *vport, .max_len = ETH_ADDR_LEN, .optional = true }, [OVS_VPORT_ATTR_OPTIONS] = { .type = NL_A_NESTED, .optional = true }, - [OVS_VPORT_ATTR_IFINDEX] = { .type = NL_A_U32, .optional = true }, }; struct nlattr *a[ARRAY_SIZE(ovs_vport_policy)]; @@ -1327,7 +1365,7 @@ dpif_linux_vport_from_ofpbuf(struct dpif_linux_vport *vport, vport->type = nl_attr_get_u32(a[OVS_VPORT_ATTR_TYPE]); vport->name = nl_attr_get_string(a[OVS_VPORT_ATTR_NAME]); if (a[OVS_VPORT_ATTR_UPCALL_PID]) { - vport->upcall_pid = nl_attr_get_u32(a[OVS_VPORT_ATTR_UPCALL_PID]); + vport->upcall_pid = nl_attr_get(a[OVS_VPORT_ATTR_UPCALL_PID]); } if (a[OVS_VPORT_ATTR_STATS]) { vport->stats = nl_attr_get(a[OVS_VPORT_ATTR_STATS]); @@ -1339,9 +1377,6 @@ dpif_linux_vport_from_ofpbuf(struct dpif_linux_vport *vport, vport->options = nl_attr_get(a[OVS_VPORT_ATTR_OPTIONS]); vport->options_len = nl_attr_get_size(a[OVS_VPORT_ATTR_OPTIONS]); } - if (a[OVS_VPORT_ATTR_IFINDEX]) { - vport->ifindex = nl_attr_get_u32(a[OVS_VPORT_ATTR_IFINDEX]); - } return 0; } @@ -1354,7 +1389,7 @@ dpif_linux_vport_to_ofpbuf(const struct dpif_linux_vport *vport, struct ovs_header *ovs_header; nl_msg_put_genlmsghdr(buf, 0, ovs_vport_family, NLM_F_REQUEST | NLM_F_ECHO, - vport->cmd, 1); + vport->cmd, OVS_VPORT_VERSION); ovs_header = ofpbuf_put_uninit(buf, sizeof *ovs_header); ovs_header->dp_ifindex = vport->dp_ifindex; @@ -1371,7 +1406,9 @@ dpif_linux_vport_to_ofpbuf(const struct dpif_linux_vport *vport, nl_msg_put_string(buf, OVS_VPORT_ATTR_NAME, vport->name); } - nl_msg_put_u32(buf, OVS_VPORT_ATTR_UPCALL_PID, vport->upcall_pid); + if (vport->upcall_pid) { + nl_msg_put_u32(buf, OVS_VPORT_ATTR_UPCALL_PID, *vport->upcall_pid); + } if (vport->stats) { nl_msg_put_unspec(buf, OVS_VPORT_ATTR_STATS, @@ -1387,10 +1424,6 @@ dpif_linux_vport_to_ofpbuf(const struct dpif_linux_vport *vport, nl_msg_put_nested(buf, OVS_VPORT_ATTR_OPTIONS, vport->options, vport->options_len); } - - if (vport->ifindex) { - nl_msg_put_u32(buf, OVS_VPORT_ATTR_IFINDEX, vport->ifindex); - } } /* Clears 'vport' to "empty" values. */ @@ -1475,7 +1508,6 @@ dpif_linux_dp_from_ofpbuf(struct dpif_linux_dp *dp, const struct ofpbuf *buf) .min_len = sizeof(struct ovs_dp_stats), .max_len = sizeof(struct ovs_dp_stats), .optional = true }, - [OVS_DP_ATTR_IPV4_FRAGS] = { .type = NL_A_U32, .optional = true }, }; struct nlattr *a[ARRAY_SIZE(ovs_datapath_policy)]; @@ -1506,9 +1538,6 @@ dpif_linux_dp_from_ofpbuf(struct dpif_linux_dp *dp, const struct ofpbuf *buf) memcpy(&dp->stats, nl_attr_get(a[OVS_DP_ATTR_STATS]), sizeof dp->stats); } - if (a[OVS_DP_ATTR_IPV4_FRAGS]) { - dp->ipv4_frags = nl_attr_get_u32(a[OVS_DP_ATTR_IPV4_FRAGS]); - } return 0; } @@ -1520,7 +1549,8 @@ dpif_linux_dp_to_ofpbuf(const struct dpif_linux_dp *dp, struct ofpbuf *buf) struct ovs_header *ovs_header; nl_msg_put_genlmsghdr(buf, 0, ovs_datapath_family, - NLM_F_REQUEST | NLM_F_ECHO, dp->cmd, 1); + NLM_F_REQUEST | NLM_F_ECHO, dp->cmd, + OVS_DATAPATH_VERSION); ovs_header = ofpbuf_put_uninit(buf, sizeof *ovs_header); ovs_header->dp_ifindex = dp->dp_ifindex; @@ -1529,13 +1559,11 @@ dpif_linux_dp_to_ofpbuf(const struct dpif_linux_dp *dp, struct ofpbuf *buf) nl_msg_put_string(buf, OVS_DP_ATTR_NAME, dp->name); } - nl_msg_put_u32(buf, OVS_DP_ATTR_UPCALL_PID, dp->upcall_pid); + if (dp->upcall_pid) { + nl_msg_put_u32(buf, OVS_DP_ATTR_UPCALL_PID, *dp->upcall_pid); + } /* Skip OVS_DP_ATTR_STATS since we never have a reason to serialize it. */ - - if (dp->ipv4_frags) { - nl_msg_put_u32(buf, OVS_DP_ATTR_IPV4_FRAGS, dp->ipv4_frags); - } } /* Clears 'dp' to "empty" values. */ @@ -1623,7 +1651,6 @@ dpif_linux_flow_from_ofpbuf(struct dpif_linux_flow *flow, static const struct nl_policy ovs_flow_policy[] = { [OVS_FLOW_ATTR_KEY] = { .type = NL_A_NESTED }, [OVS_FLOW_ATTR_ACTIONS] = { .type = NL_A_NESTED, .optional = true }, - [OVS_FLOW_ATTR_UPCALL_PID] = { .type = NL_A_U32 }, [OVS_FLOW_ATTR_STATS] = { .type = NL_A_UNSPEC, .min_len = sizeof(struct ovs_flow_stats), .max_len = sizeof(struct ovs_flow_stats), @@ -1660,9 +1687,6 @@ dpif_linux_flow_from_ofpbuf(struct dpif_linux_flow *flow, flow->actions = nl_attr_get(a[OVS_FLOW_ATTR_ACTIONS]); flow->actions_len = nl_attr_get_size(a[OVS_FLOW_ATTR_ACTIONS]); } - if (a[OVS_FLOW_ATTR_UPCALL_PID]) { - flow->upcall_pid = nl_attr_get_u32(a[OVS_FLOW_ATTR_UPCALL_PID]); - } if (a[OVS_FLOW_ATTR_STATS]) { flow->stats = nl_attr_get(a[OVS_FLOW_ATTR_STATS]); } @@ -1684,8 +1708,8 @@ dpif_linux_flow_to_ofpbuf(const struct dpif_linux_flow *flow, struct ovs_header *ovs_header; nl_msg_put_genlmsghdr(buf, 0, ovs_flow_family, - NLM_F_REQUEST | NLM_F_ECHO | flow->nlmsg_flags, - flow->cmd, 1); + NLM_F_REQUEST | flow->nlmsg_flags, + flow->cmd, OVS_FLOW_VERSION); ovs_header = ofpbuf_put_uninit(buf, sizeof *ovs_header); ovs_header->dp_ifindex = flow->dp_ifindex; @@ -1699,8 +1723,6 @@ dpif_linux_flow_to_ofpbuf(const struct dpif_linux_flow *flow, flow->actions, flow->actions_len); } - nl_msg_put_u32(buf, OVS_FLOW_ATTR_UPCALL_PID, flow->upcall_pid); - /* We never need to send these to the kernel. */ assert(!flow->stats); assert(!flow->tcp_flags); @@ -1725,7 +1747,7 @@ dpif_linux_flow_init(struct dpif_linux_flow *flow) * stored in '*reply' and '*bufp'. The caller must free '*bufp' when the reply * is no longer needed ('reply' will contain pointers into '*bufp'). */ static int -dpif_linux_flow_transact(const struct dpif_linux_flow *request, +dpif_linux_flow_transact(struct dpif_linux_flow *request, struct dpif_linux_flow *reply, struct ofpbuf **bufp) { struct ofpbuf *request_buf; @@ -1733,6 +1755,10 @@ dpif_linux_flow_transact(const struct dpif_linux_flow *request, assert((reply != NULL) == (bufp != NULL)); + if (reply) { + request->nlmsg_flags |= NLM_F_ECHO; + } + request_buf = ofpbuf_new(1024); dpif_linux_flow_to_ofpbuf(request, request_buf); error = nl_sock_transact(genl_sock, request_buf, bufp); @@ -1762,7 +1788,6 @@ dpif_linux_flow_get_stats(const struct dpif_linux_flow *flow, stats->n_packets = 0; stats->n_bytes = 0; } - stats->used = flow->used ? get_unaligned_u64(flow->used) : 0; + stats->used = flow->used ? get_32aligned_u64(flow->used) : 0; stats->tcp_flags = flow->tcp_flags ? *flow->tcp_flags : 0; } -