projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xenserver: Always call ovs-vsctl in bring_down().
[openvswitch]
/
lib
/
dpif-netdev.c
diff --git
a/lib/dpif-netdev.c
b/lib/dpif-netdev.c
index cae6d2319a83a9d1eb4dae5f7116da9e0043a92d..1dee14b476e92c690a341ad6ea91db9b2b78588a 100644
(file)
--- a/
lib/dpif-netdev.c
+++ b/
lib/dpif-netdev.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2009 Nicira Networks.
+ * Copyright (c) 2009
, 2010
Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-23,15
+23,11
@@
#include <fcntl.h>
#include <inttypes.h>
#include <net/if.h>
#include <fcntl.h>
#include <inttypes.h>
#include <net/if.h>
-#include <linux/rtnetlink.h>
-#include <linux/ethtool.h>
-#include <linux/sockios.h>
#include <netinet/in.h>
#include <stdlib.h>
#include <string.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <netinet/in.h>
#include <stdlib.h>
#include <string.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
-#include <sys/sysmacros.h>
#include <unistd.h>
#include "csum.h"
#include <unistd.h>
#include "csum.h"
@@
-68,7
+64,7
@@
struct dp_netdev {
struct list node;
int dp_idx;
int open_cnt;
struct list node;
int dp_idx;
int open_cnt;
- bool de
let
ed;
+ bool de
stroy
ed;
bool drop_frags; /* Drop all IP fragments, if true. */
struct ovs_queue queues[N_QUEUES]; /* Messages queued for dpif_recv(). */
bool drop_frags; /* Drop all IP fragments, if true. */
struct ovs_queue queues[N_QUEUES]; /* Messages queued for dpif_recv(). */
@@
-160,7
+156,7
@@
get_dp_netdev(const struct dpif *dpif)
static int
name_to_dp_idx(const char *name)
{
static int
name_to_dp_idx(const char *name)
{
- if (!strncmp(name, "dp", 2) && isdigit(name[2])) {
+ if (!strncmp(name, "dp", 2) && isdigit(
(unsigned char)
name[2])) {
int dp_idx = atoi(name + 2);
if (dp_idx >= 0 && dp_idx < N_DP_NETDEVS) {
return dp_idx;
int dp_idx = atoi(name + 2);
if (dp_idx >= 0 && dp_idx < N_DP_NETDEVS) {
return dp_idx;
@@
-200,7
+196,7
@@
create_dpif_netdev(struct dp_netdev *dp)
dp->open_cnt++;
dp->open_cnt++;
- dpname = xasprintf("
netdev:
dp%d", dp->dp_idx);
+ dpname = xasprintf("dp%d", dp->dp_idx);
dpif = xmalloc(sizeof *dpif);
dpif_init(&dpif->dpif, &dpif_netdev_class, dpname, dp->dp_idx, dp->dp_idx);
dpif->dp = dp;
dpif = xmalloc(sizeof *dpif);
dpif_init(&dpif->dpif, &dpif_netdev_class, dpname, dp->dp_idx, dp->dp_idx);
dpif->dp = dp;
@@
-223,7
+219,7
@@
create_dp_netdev(const char *name, int dp_idx, struct dpif **dpifp)
}
/* Create datapath. */
}
/* Create datapath. */
- dp_netdevs[dp_idx] = dp = x
calloc(1,
sizeof *dp);
+ dp_netdevs[dp_idx] = dp = x
zalloc(
sizeof *dp);
list_push_back(&dp_netdev_list, &dp->node);
dp->dp_idx = dp_idx;
dp->open_cnt = 0;
list_push_back(&dp_netdev_list, &dp->node);
dp->dp_idx = dp_idx;
dp->open_cnt = 0;
@@
-241,7
+237,7
@@
create_dp_netdev(const char *name, int dp_idx, struct dpif **dpifp)
error = do_add_port(dp, name, ODP_PORT_INTERNAL, ODPP_LOCAL);
if (error) {
dp_netdev_free(dp);
error = do_add_port(dp, name, ODP_PORT_INTERNAL, ODPP_LOCAL);
if (error) {
dp_netdev_free(dp);
- return
error
;
+ return
ENODEV
;
}
*dpifp = create_dpif_netdev(dp);
}
*dpifp = create_dpif_netdev(dp);
@@
-249,20
+245,20
@@
create_dp_netdev(const char *name, int dp_idx, struct dpif **dpifp)
}
static int
}
static int
-dpif_netdev_open(const char *name
UNUSED, char *suffix
, bool create,
+dpif_netdev_open(const char *name
, const char *type OVS_UNUSED
, bool create,
struct dpif **dpifp)
{
if (create) {
struct dpif **dpifp)
{
if (create) {
- if (find_dp_netdev(
suffix
)) {
+ if (find_dp_netdev(
name
)) {
return EEXIST;
} else {
return EEXIST;
} else {
- int dp_idx = name_to_dp_idx(
suffix
);
+ int dp_idx = name_to_dp_idx(
name
);
if (dp_idx >= 0) {
if (dp_idx >= 0) {
- return create_dp_netdev(
suffix
, dp_idx, dpifp);
+ return create_dp_netdev(
name
, dp_idx, dpifp);
} else {
/* Scan for unused dp_idx number. */
for (dp_idx = 0; dp_idx < N_DP_NETDEVS; dp_idx++) {
} else {
/* Scan for unused dp_idx number. */
for (dp_idx = 0; dp_idx < N_DP_NETDEVS; dp_idx++) {
- int error = create_dp_netdev(
suffix
, dp_idx, dpifp);
+ int error = create_dp_netdev(
name
, dp_idx, dpifp);
if (error != EBUSY) {
return error;
}
if (error != EBUSY) {
return error;
}
@@
-273,7
+269,7
@@
dpif_netdev_open(const char *name UNUSED, char *suffix, bool create,
}
}
} else {
}
}
} else {
- struct dp_netdev *dp = find_dp_netdev(
suffix
);
+ struct dp_netdev *dp = find_dp_netdev(
name
);
if (dp) {
*dpifp = create_dpif_netdev(dp);
return 0;
if (dp) {
*dpifp = create_dpif_netdev(dp);
return 0;
@@
-311,17
+307,17
@@
dpif_netdev_close(struct dpif *dpif)
{
struct dp_netdev *dp = get_dp_netdev(dpif);
assert(dp->open_cnt > 0);
{
struct dp_netdev *dp = get_dp_netdev(dpif);
assert(dp->open_cnt > 0);
- if (--dp->open_cnt == 0 && dp->de
let
ed) {
+ if (--dp->open_cnt == 0 && dp->de
stroy
ed) {
dp_netdev_free(dp);
}
free(dpif);
}
static int
dp_netdev_free(dp);
}
free(dpif);
}
static int
-dpif_netdev_de
lete
(struct dpif *dpif)
+dpif_netdev_de
stroy
(struct dpif *dpif)
{
struct dp_netdev *dp = get_dp_netdev(dpif);
{
struct dp_netdev *dp = get_dp_netdev(dpif);
- dp->de
let
ed = true;
+ dp->de
stroy
ed = true;
return 0;
}
return 0;
}
@@
-367,6
+363,7
@@
do_add_port(struct dp_netdev *dp, const char *devname, uint16_t flags,
{
bool internal = (flags & ODP_PORT_INTERNAL) != 0;
struct dp_netdev_port *port;
{
bool internal = (flags & ODP_PORT_INTERNAL) != 0;
struct dp_netdev_port *port;
+ struct netdev_options netdev_options;
struct netdev *netdev;
int mtu;
int error;
struct netdev *netdev;
int mtu;
int error;
@@
-374,11
+371,17
@@
do_add_port(struct dp_netdev *dp, const char *devname, uint16_t flags,
/* XXX reject devices already in some dp_netdev. */
/* Open and validate network device. */
/* XXX reject devices already in some dp_netdev. */
/* Open and validate network device. */
- if (!internal) {
- error = netdev_open(devname, NETDEV_ETH_TYPE_ANY, &netdev);
+ memset(&netdev_options, 0, sizeof netdev_options);
+ netdev_options.name = devname;
+ netdev_options.ethertype = NETDEV_ETH_TYPE_ANY;
+ netdev_options.may_create = true;
+ if (internal) {
+ netdev_options.type = "tap";
} else {
} else {
-
error = netdev_open_tap(devname, &netdev)
;
+
netdev_options.may_open = true
;
}
}
+
+ error = netdev_open(&netdev_options, &netdev);
if (error) {
return error;
}
if (error) {
return error;
}
@@
-396,7
+399,7
@@
do_add_port(struct dp_netdev *dp, const char *devname, uint16_t flags,
port->netdev = netdev;
port->internal = internal;
port->netdev = netdev;
port->internal = internal;
-
mtu = netdev_get_mtu(netdev
);
+
netdev_get_mtu(netdev, &mtu
);
if (mtu > max_mtu) {
max_mtu = mtu;
}
if (mtu > max_mtu) {
max_mtu = mtu;
}
@@
-422,7
+425,7
@@
dpif_netdev_port_add(struct dpif *dpif, const char *devname, uint16_t flags,
return do_add_port(dp, devname, flags, port_no);
}
}
return do_add_port(dp, devname, flags, port_no);
}
}
- return E
XFULL
;
+ return E
FBIG
;
}
static int
}
static int
@@
-470,6
+473,7
@@
static int
do_del_port(struct dp_netdev *dp, uint16_t port_no)
{
struct dp_netdev_port *port;
do_del_port(struct dp_netdev *dp, uint16_t port_no)
{
struct dp_netdev_port *port;
+ char *name;
int error;
error = get_port_by_number(dp, port_no, &port);
int error;
error = get_port_by_number(dp, port_no, &port);
@@
-482,7
+486,10
@@
do_del_port(struct dp_netdev *dp, uint16_t port_no)
dp->n_ports--;
dp->serial++;
dp->n_ports--;
dp->serial++;
+ name = xstrdup(netdev_get_name(port->netdev));
netdev_close(port->netdev);
netdev_close(port->netdev);
+
+ free(name);
free(port);
return 0;
free(port);
return 0;
@@
-575,7
+582,7
@@
dpif_netdev_port_list(const struct dpif *dpif, struct odp_port *ports, int n)
}
static int
}
static int
-dpif_netdev_port_poll(const struct dpif *dpif_, char **devnamep UNUSED)
+dpif_netdev_port_poll(const struct dpif *dpif_, char **devnamep
OVS_
UNUSED)
{
struct dpif_netdev *dpif = dpif_netdev_cast(dpif_);
if (dpif->dp_serial != dpif->dp->serial) {
{
struct dpif_netdev *dpif = dpif_netdev_cast(dpif_);
if (dpif->dp_serial != dpif->dp->serial) {
@@
-667,7
+674,7
@@
dp_netdev_lookup_flow(const struct dp_netdev *dp, const flow_t *key)
}
static void
}
static void
-answer_flow_query(
const struct dp_netdev_flow *flow
,
+answer_flow_query(
struct dp_netdev_flow *flow, uint32_t query_flags
,
struct odp_flow *odp_flow)
{
if (flow) {
struct odp_flow *odp_flow)
{
if (flow) {
@@
-685,6
+692,11
@@
answer_flow_query(const struct dp_netdev_flow *flow,
n * sizeof *odp_flow->actions);
odp_flow->n_actions = flow->n_actions;
}
n * sizeof *odp_flow->actions);
odp_flow->n_actions = flow->n_actions;
}
+
+ if (query_flags & ODPFF_ZERO_TCP_FLAGS) {
+ flow->tcp_ctl = 0;
+ }
+
} else {
odp_flow->stats.error = ENOENT;
}
} else {
odp_flow->stats.error = ENOENT;
}
@@
-698,7
+710,8
@@
dpif_netdev_flow_get(const struct dpif *dpif, struct odp_flow flows[], int n)
for (i = 0; i < n; i++) {
struct odp_flow *odp_flow = &flows[i];
for (i = 0; i < n; i++) {
struct odp_flow *odp_flow = &flows[i];
- answer_flow_query(dp_netdev_lookup_flow(dp, &odp_flow->key), odp_flow);
+ answer_flow_query(dp_netdev_lookup_flow(dp, &odp_flow->key),
+ odp_flow->flags, odp_flow);
}
return 0;
}
}
return 0;
}
@@
-790,7
+803,7
@@
add_flow(struct dpif *dpif, struct odp_flow *odp_flow)
struct dp_netdev_flow *flow;
int error;
struct dp_netdev_flow *flow;
int error;
- flow = x
calloc(1,
sizeof *flow);
+ flow = x
zalloc(
sizeof *flow);
flow->key = odp_flow->key;
flow->key.reserved = 0;
flow->key = odp_flow->key;
flow->key.reserved = 0;
@@
-827,7
+840,7
@@
dpif_netdev_flow_put(struct dpif *dpif, struct odp_flow_put *put)
if (hmap_count(&dp->flow_table) < MAX_FLOWS) {
return add_flow(dpif, &put->flow);
} else {
if (hmap_count(&dp->flow_table) < MAX_FLOWS) {
return add_flow(dpif, &put->flow);
} else {
- return E
XFULL
;
+ return E
FBIG
;
}
} else {
return ENOENT;
}
} else {
return ENOENT;
@@
-854,7
+867,7
@@
dpif_netdev_flow_del(struct dpif *dpif, struct odp_flow *odp_flow)
flow = dp_netdev_lookup_flow(dp, &odp_flow->key);
if (flow) {
flow = dp_netdev_lookup_flow(dp, &odp_flow->key);
if (flow) {
- answer_flow_query(flow, odp_flow);
+ answer_flow_query(flow,
0,
odp_flow);
dp_netdev_free_flow(dp, flow);
return 0;
} else {
dp_netdev_free_flow(dp, flow);
return 0;
} else {
@@
-874,7
+887,7
@@
dpif_netdev_flow_list(const struct dpif *dpif, struct odp_flow flows[], int n)
if (i >= n) {
break;
}
if (i >= n) {
break;
}
- answer_flow_query(flow, &flows[i++]);
+ answer_flow_query(flow,
0,
&flows[i++]);
}
return hmap_count(&dp->flow_table);
}
}
return hmap_count(&dp->flow_table);
}
@@
-890,7
+903,7
@@
dpif_netdev_execute(struct dpif *dpif, uint16_t in_port,
flow_t flow;
int error;
flow_t flow;
int error;
- if (packet->size < ETH_HLEN || packet->size > UINT16_MAX) {
+ if (packet->size < ETH_H
EADER_
LEN || packet->size > UINT16_MAX) {
return EINVAL;
}
return EINVAL;
}
@@
-988,7
+1001,7
@@
dp_netdev_flow_used(struct dp_netdev_flow *flow, const flow_t *key,
time_timeval(&flow->used);
flow->packet_count++;
flow->byte_count += packet->size;
time_timeval(&flow->used);
flow->packet_count++;
flow->byte_count += packet->size;
- if (key->dl_type == htons(ETH_
P
_IP)) {
+ if (key->dl_type == htons(ETH_
TYPE
_IP)) {
struct ip_header *nh = packet->l3;
flow->ip_tos = nh->ip_tos;
struct ip_header *nh = packet->l3;
flow->ip_tos = nh->ip_tos;
@@
-1161,7
+1174,7
@@
static void
dp_netdev_set_tp_port(struct ofpbuf *packet, flow_t *key,
const struct odp_action_tp_port *a)
{
dp_netdev_set_tp_port(struct ofpbuf *packet, flow_t *key,
const struct odp_action_tp_port *a)
{
- if (key->dl_type == htons(ETH_
P
_IP)) {
+ if (key->dl_type == htons(ETH_
TYPE
_IP)) {
uint16_t *field;
if (key->nw_proto == IPPROTO_TCP) {
struct tcp_header *th = packet->l4;
uint16_t *field;
if (key->nw_proto == IPPROTO_TCP) {
struct tcp_header *th = packet->l4;
@@
-1290,7
+1303,6
@@
dp_netdev_execute_actions(struct dp_netdev *dp,
}
const struct dpif_class dpif_netdev_class = {
}
const struct dpif_class dpif_netdev_class = {
- "netdev",
"netdev",
dp_netdev_run,
dp_netdev_wait,
"netdev",
dp_netdev_run,
dp_netdev_wait,
@@
-1298,7
+1310,7
@@
const struct dpif_class dpif_netdev_class = {
dpif_netdev_open,
dpif_netdev_close,
NULL, /* get_all_names */
dpif_netdev_open,
dpif_netdev_close,
NULL, /* get_all_names */
- dpif_netdev_de
lete
,
+ dpif_netdev_de
stroy
,
dpif_netdev_get_stats,
dpif_netdev_get_drop_frags,
dpif_netdev_set_drop_frags,
dpif_netdev_get_stats,
dpif_netdev_get_drop_frags,
dpif_netdev_set_drop_frags,
@@
-1319,6
+1331,8
@@
const struct dpif_class dpif_netdev_class = {
dpif_netdev_execute,
dpif_netdev_recv_get_mask,
dpif_netdev_recv_set_mask,
dpif_netdev_execute,
dpif_netdev_recv_get_mask,
dpif_netdev_recv_set_mask,
+ NULL, /* get_sflow_probability */
+ NULL, /* set_sflow_probability */
dpif_netdev_recv,
dpif_netdev_recv_wait,
};
dpif_netdev_recv,
dpif_netdev_recv_wait,
};