Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

openvswitch: Use generic struct pcpu_tstats. 

Rather than defining ovs specific stats struct (vport_percpu_stats),
we can use existing pcpu_tstats to achieve exactly same functionality.

Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>
This commit is contained in:
Pravin B Shelar 2013-04-15 13:30:37 -07:00 committed by Jesse Gross
parent 8e4e1713e4
commit e0f0ecf33c
2 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
net/openvswitch/vport.c
View File

@ -128,7 +128,7 @@ struct vport *ovs_vport_alloc(int priv_size, const struct vport_ops *ops,
vport->ops = ops; vport->ops = ops;
INIT_HLIST_NODE(&vport->dp_hash_node); INIT_HLIST_NODE(&vport->dp_hash_node);
vport->percpu_stats = alloc_percpu(struct vport_percpu_stats); vport->percpu_stats = alloc_percpu(struct pcpu_tstats);
if (!vport->percpu_stats) { if (!vport->percpu_stats) {
kfree(vport); kfree(vport);
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
@ -260,16 +260,16 @@ void ovs_vport_get_stats(struct vport *vport, struct ovs_vport_stats *stats)
spin_unlock_bh(&vport->stats_lock); spin_unlock_bh(&vport->stats_lock);
for_each_possible_cpu(i) { for_each_possible_cpu(i) {
const struct vport_percpu_stats *percpu_stats; const struct pcpu_tstats *percpu_stats;
struct vport_percpu_stats local_stats; struct pcpu_tstats local_stats;
unsigned int start; unsigned int start;
percpu_stats = per_cpu_ptr(vport->percpu_stats, i); percpu_stats = per_cpu_ptr(vport->percpu_stats, i);
do { do {
start = u64_stats_fetch_begin_bh(&percpu_stats->sync); start = u64_stats_fetch_begin_bh(&percpu_stats->syncp);
local_stats = *percpu_stats; local_stats = *percpu_stats;
} while (u64_stats_fetch_retry_bh(&percpu_stats->sync, start)); } while (u64_stats_fetch_retry_bh(&percpu_stats->syncp, start));
stats->rx_bytes += local_stats.rx_bytes; stats->rx_bytes += local_stats.rx_bytes;
stats->rx_packets += local_stats.rx_packets; stats->rx_packets += local_stats.rx_packets;
@ -327,13 +327,13 @@ int ovs_vport_get_options(const struct vport *vport, struct sk_buff *skb)
*/ */
void ovs_vport_receive(struct vport *vport, struct sk_buff *skb) void ovs_vport_receive(struct vport *vport, struct sk_buff *skb)
{ {
struct vport_percpu_stats *stats; struct pcpu_tstats *stats;
stats = this_cpu_ptr(vport->percpu_stats); stats = this_cpu_ptr(vport->percpu_stats);
u64_stats_update_begin(&stats->sync); u64_stats_update_begin(&stats->syncp);
stats->rx_packets++; stats->rx_packets++;
stats->rx_bytes += skb->len; stats->rx_bytes += skb->len;
u64_stats_update_end(&stats->sync); u64_stats_update_end(&stats->syncp);
ovs_dp_process_received_packet(vport, skb); ovs_dp_process_received_packet(vport, skb);
} }
@ -352,14 +352,14 @@ int ovs_vport_send(struct vport *vport, struct sk_buff *skb)
int sent = vport->ops->send(vport, skb); int sent = vport->ops->send(vport, skb);
if (likely(sent)) { if (likely(sent)) {
struct vport_percpu_stats *stats; struct pcpu_tstats *stats;
stats = this_cpu_ptr(vport->percpu_stats); stats = this_cpu_ptr(vport->percpu_stats);
u64_stats_update_begin(&stats->sync); u64_stats_update_begin(&stats->syncp);
stats->tx_packets++; stats->tx_packets++;
stats->tx_bytes += sent; stats->tx_bytes += sent;
u64_stats_update_end(&stats->sync); u64_stats_update_end(&stats->syncp);
} }
return sent; return sent;
} }

11
net/openvswitch/vport.h
View File

@ -19,6 +19,7 @@
#ifndef VPORT_H #ifndef VPORT_H
#define VPORT_H 1 #define VPORT_H 1
#include <linux/if_tunnel.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/netlink.h> #include <linux/netlink.h>
#include <linux/openvswitch.h> #include <linux/openvswitch.h>
@ -50,14 +51,6 @@ int ovs_vport_send(struct vport *, struct sk_buff *);
/* The following definitions are for implementers of vport devices: */ /* The following definitions are for implementers of vport devices: */
struct vport_percpu_stats {
u64 rx_bytes;
u64 rx_packets;
u64 tx_bytes;
u64 tx_packets;
struct u64_stats_sync sync;
};
struct vport_err_stats { struct vport_err_stats {
u64 rx_dropped; u64 rx_dropped;
u64 rx_errors; u64 rx_errors;
@ -89,7 +82,7 @@ struct vport {
struct hlist_node dp_hash_node; struct hlist_node dp_hash_node;
const struct vport_ops *ops; const struct vport_ops *ops;
struct vport_percpu_stats __percpu *percpu_stats; struct pcpu_tstats __percpu *percpu_stats;
spinlock_t stats_lock; spinlock_t stats_lock;
struct vport_err_stats err_stats; struct vport_err_stats err_stats;