X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fdatapath.c;h=39bc190bcc9dcd816c9585c52c54094b6116d233;hb=4959755dc8512f6a0b19ce13138d6d001629904d;hp=9fc778bed53cb806cc13c22bfd8c956ab18960ef;hpb=1c075d0aff8267b05073971211e79d73392078cf;p=openvswitch diff --git a/datapath/datapath.c b/datapath/datapath.c index 9fc778be..39bc190b 100644 --- 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 = __vport_add(odp_port->devname, "internal", NULL); + vport = vport_add(odp_port->devname, "internal", NULL); else - vport = __vport_add(odp_port->devname, "netdev", NULL); + vport = vport_add(odp_port->devname, "netdev", NULL); 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(); - __vport_del(vport); + vport_del(vport); vport_unlock(); } } @@ -512,11 +512,12 @@ out: 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; + int stats_counter_off; 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; - /* 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); - 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); - stats->n_hit++; + stats_counter_off = offsetof(struct dp_stats_percpu, n_hit); } 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); } + +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) @@ -1301,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); + + rcu_read_lock(); err = execute_actions(dp, skb, &key, actions->actions, actions->n_actions, GFP_KERNEL); + rcu_read_unlock(); + kfree(actions); return err; @@ -1339,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; - 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; @@ -1568,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; - 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) @@ -1611,35 +1619,39 @@ static long openvswitch_ioctl(struct file *f, unsigned int cmd, 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: - 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: - err = vport_del((char __user *)argp); + err = vport_user_del((char __user *)argp); 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: - 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: - 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: - 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: - err = vport_mtu_set((struct odp_vport_mtu __user *)argp); + err = vport_user_mtu_set((struct odp_vport_mtu __user *)argp); goto exit; } @@ -1786,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, - 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) @@ -1990,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_STATS_SET: case ODP_VPORT_STATS_GET: case ODP_DP_STATS: case ODP_GET_DROP_FRAGS: @@ -2003,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 compat_vport_add(compat_ptr(argp)); + return compat_vport_user_add(compat_ptr(argp)); 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);