Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0f0ecf3 authored by Pravin B Shelar's avatar Pravin B Shelar Committed by Jesse Gross
Browse files

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: default avatarPravin B Shelar <pshelar@nicira.com>
Signed-off-by: default avatarJesse Gross <jesse@nicira.com>
parent 8e4e1713

net/openvswitch/vport.c

+11 −11
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ struct vport *ovs_vport_alloc(int priv_size, const struct vport_ops *ops, 
	vport->ops = ops;

	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) {

		kfree(vport);

		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);



	for_each_possible_cpu(i) {

		const struct vport_percpu_stats *percpu_stats;

		struct vport_percpu_stats local_stats;

		const struct pcpu_tstats *percpu_stats;

		struct pcpu_tstats local_stats;

		unsigned int start;



		percpu_stats = per_cpu_ptr(vport->percpu_stats, i);



		do {

			start = u64_stats_fetch_begin_bh(&percpu_stats->sync);

			start = u64_stats_fetch_begin_bh(&percpu_stats->syncp);

			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_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)

{

	struct vport_percpu_stats *stats;

	struct pcpu_tstats *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_bytes += skb->len;

	u64_stats_update_end(&stats->sync);

	u64_stats_update_end(&stats->syncp);



	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);



	if (likely(sent)) {

		struct vport_percpu_stats *stats;

		struct pcpu_tstats *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_bytes += sent;

		u64_stats_update_end(&stats->sync);

		u64_stats_update_end(&stats->syncp);

	}

	return sent;

}

net/openvswitch/vport.h

+2 −9
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#ifndef VPORT_H

#define VPORT_H 1



#include <linux/if_tunnel.h>

#include <linux/list.h>

#include <linux/netlink.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: */



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 {

	u64 rx_dropped;

	u64 rx_errors;
@@ -89,7 +82,7 @@ struct vport { 
	struct hlist_node dp_hash_node;

	const struct vport_ops *ops;



	struct vport_percpu_stats __percpu *percpu_stats;

	struct pcpu_tstats __percpu *percpu_stats;



	spinlock_t stats_lock;

	struct vport_err_stats err_stats;