projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xenserver: Delete network.conf on package removal on XenServer 5.5.0.
[openvswitch]
/
datapath
/
datapath.c
diff --git
a/datapath/datapath.c
b/datapath/datapath.c
index 837f567caf929a945511199c9af467c0295a3fb0..39bc190bcc9dcd816c9585c52c54094b6116d233 100644
(file)
--- a/
datapath/datapath.c
+++ b/
datapath/datapath.c
@@
-363,9
+363,9
@@
static int new_dp_port(struct datapath *dp, struct odp_port *odp_port, int port_
vport_lock();
if (odp_port->flags & ODP_PORT_INTERNAL)
vport_lock();
if (odp_port->flags & ODP_PORT_INTERNAL)
- vport =
__
vport_add(odp_port->devname, "internal", NULL);
+ vport = vport_add(odp_port->devname, "internal", NULL);
else
else
- vport =
__
vport_add(odp_port->devname, "netdev", NULL);
+ vport = vport_add(odp_port->devname, "netdev", NULL);
vport_unlock();
vport_unlock();
@@
-471,7
+471,7
@@
int dp_detach_port(struct dp_port *p, int may_delete)
if (!strcmp(port_type, "netdev") || !strcmp(port_type, "internal")) {
vport_lock();
if (!strcmp(port_type, "netdev") || !strcmp(port_type, "internal")) {
vport_lock();
-
__
vport_del(vport);
+ vport_del(vport);
vport_unlock();
}
}
vport_unlock();
}
}
@@
-512,11
+512,12
@@
out:
return err;
}
return err;
}
-/* Must be called with rcu_read_lock
and with bottom-halves disabled
. */
+/* Must be called with rcu_read_lock. */
void dp_process_received_packet(struct dp_port *p, struct sk_buff *skb)
{
struct datapath *dp = p->dp;
struct dp_stats_percpu *stats;
void dp_process_received_packet(struct dp_port *p, struct sk_buff *skb)
{
struct datapath *dp = p->dp;
struct dp_stats_percpu *stats;
+ int stats_counter_off;
struct odp_flow_key key;
struct tbl_node *flow_node;
struct odp_flow_key key;
struct tbl_node *flow_node;
@@
-525,14
+526,11
@@
void dp_process_received_packet(struct dp_port *p, struct sk_buff *skb)
OVS_CB(skb)->dp_port = p;
OVS_CB(skb)->dp_port = p;
- /* BHs are off so we don't have to use get_cpu()/put_cpu() here. */
- stats = percpu_ptr(dp->stats_percpu, smp_processor_id());
-
if (flow_extract(skb, p ? p->port_no : ODPP_NONE, &key)) {
if (dp->drop_frags) {
kfree_skb(skb);
if (flow_extract(skb, p ? p->port_no : ODPP_NONE, &key)) {
if (dp->drop_frags) {
kfree_skb(skb);
- stats
->n_frags++
;
-
return
;
+ stats
_counter_off = offsetof(struct dp_stats_percpu, n_frags)
;
+
goto out
;
}
}
}
}
@@
-543,11
+541,17
@@
void dp_process_received_packet(struct dp_port *p, struct sk_buff *skb)
flow_used(flow, skb);
execute_actions(dp, skb, &key, acts->actions, acts->n_actions,
GFP_ATOMIC);
flow_used(flow, skb);
execute_actions(dp, skb, &key, acts->actions, acts->n_actions,
GFP_ATOMIC);
- stats
->n_hit++
;
+ stats
_counter_off = offsetof(struct dp_stats_percpu, n_hit)
;
} else {
} else {
- stats
->n_missed++
;
+ stats
_counter_off = offsetof(struct dp_stats_percpu, n_missed)
;
dp_output_control(dp, skb, _ODPL_MISS_NR, OVS_CB(skb)->tun_id);
}
dp_output_control(dp, skb, _ODPL_MISS_NR, OVS_CB(skb)->tun_id);
}
+
+out:
+ local_bh_disable();
+ stats = per_cpu_ptr(dp->stats_percpu, smp_processor_id());
+ (*(u64 *)((u8 *)stats + stats_counter_off))++;
+ local_bh_enable();
}
#if defined(CONFIG_XEN) && defined(HAVE_PROTO_DATA_VALID)
}
#if defined(CONFIG_XEN) && defined(HAVE_PROTO_DATA_VALID)
@@
-830,9
+834,10
@@
dp_output_control(struct datapath *dp, struct sk_buff *skb, int queue_no,
err_kfree_skb:
kfree_skb(skb);
err:
err_kfree_skb:
kfree_skb(skb);
err:
- stats = percpu_ptr(dp->stats_percpu, get_cpu());
+ local_bh_disable();
+ stats = per_cpu_ptr(dp->stats_percpu, smp_processor_id());
stats->n_lost++;
stats->n_lost++;
-
put_cpu
();
+
local_bh_enable
();
return err;
}
return err;
}
@@
-1015,7
+1020,6
@@
static int do_put_flow(struct datapath *dp, struct odp_flow_put *uf,
} else {
/* We found a matching flow. */
struct sw_flow_actions *old_acts, *new_acts;
} else {
/* We found a matching flow. */
struct sw_flow_actions *old_acts, *new_acts;
- unsigned long int flags;
flow = flow_cast(flow_node);
flow = flow_cast(flow_node);
@@
-1040,11
+1044,11
@@
static int do_put_flow(struct datapath *dp, struct odp_flow_put *uf,
}
/* Fetch stats, then clear them if necessary. */
}
/* Fetch stats, then clear them if necessary. */
- spin_lock_
irqsave(&flow->lock, flags
);
+ spin_lock_
bh(&flow->lock
);
get_stats(flow, stats);
if (uf->flags & ODPPF_ZERO_STATS)
clear_stats(flow);
get_stats(flow, stats);
if (uf->flags & ODPPF_ZERO_STATS)
clear_stats(flow);
- spin_unlock_
irqrestore(&flow->lock, flags
);
+ spin_unlock_
bh(&flow->lock
);
}
return 0;
}
return 0;
@@
-1084,15
+1088,14
@@
static int do_answer_query(struct sw_flow *flow, u32 query_flags,
{
struct sw_flow_actions *sf_acts;
struct odp_flow_stats stats;
{
struct sw_flow_actions *sf_acts;
struct odp_flow_stats stats;
- unsigned long int flags;
u32 n_actions;
u32 n_actions;
- spin_lock_
irqsave(&flow->lock, flags
);
+ spin_lock_
bh(&flow->lock
);
get_stats(flow, &stats);
get_stats(flow, &stats);
- if (query_flags & ODPFF_ZERO_TCP_FLAGS)
{
+ if (query_flags & ODPFF_ZERO_TCP_FLAGS)
flow->tcp_flags = 0;
flow->tcp_flags = 0;
- }
- spin_unlock_
irqrestore(&flow->lock, flags
);
+
+ spin_unlock_
bh(&flow->lock
);
if (copy_to_user(ustats, &stats, sizeof(struct odp_flow_stats)) ||
get_user(n_actions, n_actionsp))
if (copy_to_user(ustats, &stats, sizeof(struct odp_flow_stats)) ||
get_user(n_actions, n_actionsp))
@@
-1302,8
+1305,12
@@
static int do_execute(struct datapath *dp, const struct odp_execute *execute)
skb->protocol = htons(ETH_P_802_2);
flow_extract(skb, execute->in_port, &key);
skb->protocol = htons(ETH_P_802_2);
flow_extract(skb, execute->in_port, &key);
+
+ rcu_read_lock();
err = execute_actions(dp, skb, &key, actions->actions,
actions->n_actions, GFP_KERNEL);
err = execute_actions(dp, skb, &key, actions->actions,
actions->n_actions, GFP_KERNEL);
+ rcu_read_unlock();
+
kfree(actions);
return err;
kfree(actions);
return err;
@@
-1340,7
+1347,7
@@
static int get_dp_stats(struct datapath *dp, struct odp_stats __user *statsp)
stats.n_frags = stats.n_hit = stats.n_missed = stats.n_lost = 0;
for_each_possible_cpu(i) {
const struct dp_stats_percpu *s;
stats.n_frags = stats.n_hit = stats.n_missed = stats.n_lost = 0;
for_each_possible_cpu(i) {
const struct dp_stats_percpu *s;
- s = percpu_ptr(dp->stats_percpu, i);
+ s = per
_
cpu_ptr(dp->stats_percpu, i);
stats.n_frags += s->n_frags;
stats.n_hit += s->n_hit;
stats.n_missed += s->n_missed;
stats.n_frags += s->n_frags;
stats.n_hit += s->n_hit;
stats.n_missed += s->n_missed;
@@
-1569,7
+1576,7
@@
static int get_port_group(struct datapath *dp, struct odp_port_group __user *upg
if (copy_from_user(&pg, upg, sizeof pg))
return -EFAULT;
if (copy_from_user(&pg, upg, sizeof pg))
return -EFAULT;
- return do_get_port_group(dp, pg.ports, pg.n_ports, pg.group, &
pg.
n_ports);
+ return do_get_port_group(dp, pg.ports, pg.n_ports, pg.group, &
upg->
n_ports);
}
static int get_listen_mask(const struct file *f)
}
static int get_listen_mask(const struct file *f)
@@
-1612,35
+1619,39
@@
static long openvswitch_ioctl(struct file *f, unsigned int cmd,
goto exit;
case ODP_VPORT_ADD:
goto exit;
case ODP_VPORT_ADD:
- err = vport_add((struct odp_vport_add __user *)argp);
+ err = vport_
user_
add((struct odp_vport_add __user *)argp);
goto exit;
case ODP_VPORT_MOD:
goto exit;
case ODP_VPORT_MOD:
- err = vport_mod((struct odp_vport_mod __user *)argp);
+ err = vport_
user_
mod((struct odp_vport_mod __user *)argp);
goto exit;
case ODP_VPORT_DEL:
goto exit;
case ODP_VPORT_DEL:
- err = vport_del((char __user *)argp);
+ err = vport_
user_
del((char __user *)argp);
goto exit;
case ODP_VPORT_STATS_GET:
goto exit;
case ODP_VPORT_STATS_GET:
- err = vport_stats_get((struct odp_vport_stats_req __user *)argp);
+ err = vport_user_stats_get((struct odp_vport_stats_req __user *)argp);
+ goto exit;
+
+ case ODP_VPORT_STATS_SET:
+ err = vport_user_stats_set((struct odp_vport_stats_req __user *)argp);
goto exit;
case ODP_VPORT_ETHER_GET:
goto exit;
case ODP_VPORT_ETHER_GET:
- err = vport_ether_get((struct odp_vport_ether __user *)argp);
+ err = vport_
user_
ether_get((struct odp_vport_ether __user *)argp);
goto exit;
case ODP_VPORT_ETHER_SET:
goto exit;
case ODP_VPORT_ETHER_SET:
- err = vport_ether_set((struct odp_vport_ether __user *)argp);
+ err = vport_
user_
ether_set((struct odp_vport_ether __user *)argp);
goto exit;
case ODP_VPORT_MTU_GET:
goto exit;
case ODP_VPORT_MTU_GET:
- err = vport_mtu_get((struct odp_vport_mtu __user *)argp);
+ err = vport_
user_
mtu_get((struct odp_vport_mtu __user *)argp);
goto exit;
case ODP_VPORT_MTU_SET:
goto exit;
case ODP_VPORT_MTU_SET:
- err = vport_mtu_set((struct odp_vport_mtu __user *)argp);
+ err = vport_
user_
mtu_set((struct odp_vport_mtu __user *)argp);
goto exit;
}
goto exit;
}
@@
-1787,7
+1798,7
@@
static int compat_get_port_group(struct datapath *dp, struct compat_odp_port_gro
return -EFAULT;
return do_get_port_group(dp, compat_ptr(pg.ports), pg.n_ports,
return -EFAULT;
return do_get_port_group(dp, compat_ptr(pg.ports), pg.n_ports,
- pg.group, &
pg.
n_ports);
+ pg.group, &
upg->
n_ports);
}
static int compat_get_flow(struct odp_flow *flow, const struct compat_odp_flow __user *compat)
}
static int compat_get_flow(struct odp_flow *flow, const struct compat_odp_flow __user *compat)
@@
-1991,6
+2002,7
@@
static long openvswitch_compat_ioctl(struct file *f, unsigned int cmd, unsigned
case ODP_VPORT_MTU_GET:
case ODP_VPORT_ETHER_SET:
case ODP_VPORT_ETHER_GET:
case ODP_VPORT_MTU_GET:
case ODP_VPORT_ETHER_SET:
case ODP_VPORT_ETHER_GET:
+ case ODP_VPORT_STATS_SET:
case ODP_VPORT_STATS_GET:
case ODP_DP_STATS:
case ODP_GET_DROP_FRAGS:
case ODP_VPORT_STATS_GET:
case ODP_DP_STATS:
case ODP_GET_DROP_FRAGS:
@@
-2004,10
+2016,10
@@
static long openvswitch_compat_ioctl(struct file *f, unsigned int cmd, unsigned
return openvswitch_ioctl(f, cmd, (unsigned long)compat_ptr(argp));
case ODP_VPORT_ADD32:
return openvswitch_ioctl(f, cmd, (unsigned long)compat_ptr(argp));
case ODP_VPORT_ADD32:
- return compat_vport_add(compat_ptr(argp));
+ return compat_vport_
user_
add(compat_ptr(argp));
case ODP_VPORT_MOD32:
case ODP_VPORT_MOD32:
- return compat_vport_mod(compat_ptr(argp));
+ return compat_vport_
user_
mod(compat_ptr(argp));
}
dp = get_dp_locked(dp_idx);
}
dp = get_dp_locked(dp_idx);