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

Commit e403aded authored by Li RongQing's avatar Li RongQing Committed by David S. Miller
Browse files

openvswitch: change the data type of error status to atomic_long_t 



Change the date type of error status from u64 to atomic_long_t, and use atomic
operation, then remove the lock which is used to protect the error status.

The operation of atomic maybe faster than spin lock.

Cc: Pravin Shelar <pshelar@nicira.com>
Signed-off-by: default avatarLi RongQing <roy.qing.li@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5aaa62d6

net/openvswitch/vport.c

+8 −17
Original line number Original line Diff line number Diff line
@@ -148,8 +148,6 @@ struct vport *ovs_vport_alloc(int priv_size, const struct vport_ops *ops, 
		return ERR_PTR(-ENOMEM);

		return ERR_PTR(-ENOMEM);

	}

	}





	spin_lock_init(&vport->stats_lock);



	return vport;

	return vport;

}

}
@@ -268,14 +266,10 @@ void ovs_vport_get_stats(struct vport *vport, struct ovs_vport_stats *stats) 
	 * netdev-stats can be directly read over netlink-ioctl.

	 * netdev-stats can be directly read over netlink-ioctl.

	 */

	 */





	spin_lock_bh(&vport->stats_lock);

	stats->rx_errors  = atomic_long_read(&vport->err_stats.rx_errors);



	stats->tx_errors  = atomic_long_read(&vport->err_stats.tx_errors);

	stats->rx_errors	= vport->err_stats.rx_errors;

	stats->tx_dropped = atomic_long_read(&vport->err_stats.tx_dropped);

	stats->tx_errors	= vport->err_stats.tx_errors;

	stats->rx_dropped = atomic_long_read(&vport->err_stats.rx_dropped);

	stats->tx_dropped	= vport->err_stats.tx_dropped;

	stats->rx_dropped	= vport->err_stats.rx_dropped;



	spin_unlock_bh(&vport->stats_lock);





	for_each_possible_cpu(i) {

	for_each_possible_cpu(i) {

		const struct pcpu_sw_netstats *percpu_stats;

		const struct pcpu_sw_netstats *percpu_stats;
@@ -495,27 +489,24 @@ int ovs_vport_send(struct vport *vport, struct sk_buff *skb) 
static void ovs_vport_record_error(struct vport *vport,

static void ovs_vport_record_error(struct vport *vport,

				   enum vport_err_type err_type)

				   enum vport_err_type err_type)

{

{

	spin_lock(&vport->stats_lock);



	switch (err_type) {

	switch (err_type) {

	case VPORT_E_RX_DROPPED:

	case VPORT_E_RX_DROPPED:

		vport->err_stats.rx_dropped++;

		atomic_long_inc(&vport->err_stats.rx_dropped);

		break;

		break;





	case VPORT_E_RX_ERROR:

	case VPORT_E_RX_ERROR:

		vport->err_stats.rx_errors++;

		atomic_long_inc(&vport->err_stats.rx_errors);

		break;

		break;





	case VPORT_E_TX_DROPPED:

	case VPORT_E_TX_DROPPED:

		vport->err_stats.tx_dropped++;

		atomic_long_inc(&vport->err_stats.tx_dropped);

		break;

		break;





	case VPORT_E_TX_ERROR:

	case VPORT_E_TX_ERROR:

		vport->err_stats.tx_errors++;

		atomic_long_inc(&vport->err_stats.tx_errors);

		break;

		break;

	}

	}





	spin_unlock(&vport->stats_lock);

}

}





static void free_vport_rcu(struct rcu_head *rcu)

static void free_vport_rcu(struct rcu_head *rcu)

net/openvswitch/vport.h

+4 −6
Original line number Original line Diff line number Diff line
@@ -62,10 +62,10 @@ 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_err_stats {

struct vport_err_stats {

	u64 rx_dropped;

	atomic_long_t rx_dropped;

	u64 rx_errors;

	atomic_long_t rx_errors;

	u64 tx_dropped;

	atomic_long_t tx_dropped;

	u64 tx_errors;

	atomic_long_t tx_errors;

};

};

/**

/**

 * struct vport_portids - array of netlink portids of a vport.

 * struct vport_portids - array of netlink portids of a vport.
@@ -93,7 +93,6 @@ struct vport_portids { 
 * @dp_hash_node: Element in @datapath->ports hash table in datapath.c.

 * @dp_hash_node: Element in @datapath->ports hash table in datapath.c.

 * @ops: Class structure.

 * @ops: Class structure.

 * @percpu_stats: Points to per-CPU statistics used and maintained by vport

 * @percpu_stats: Points to per-CPU statistics used and maintained by vport

 * @stats_lock: Protects @err_stats;

 * @err_stats: Points to error statistics used and maintained by vport

 * @err_stats: Points to error statistics used and maintained by vport

 */

 */

struct vport {

struct vport {
@@ -108,7 +107,6 @@ struct vport { 




	struct pcpu_sw_netstats __percpu *percpu_stats;

	struct pcpu_sw_netstats __percpu *percpu_stats;





	spinlock_t stats_lock;

	struct vport_err_stats err_stats;

	struct vport_err_stats err_stats;

};

};