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

openvswitch: Unify vport error stats handling. 



Following patch changes vport->send return type so that vport
layer can do error accounting.

Signed-off-by: default avatarPravin B Shelar <pshelar@nicira.com>
Signed-off-by: default avatarJesse Gross <jesse@nicira.com>
parent cbd531be

net/openvswitch/vport-netdev.c

+2 −3
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static int netdev_send(struct vport *vport, struct sk_buff *skb) 
		net_warn_ratelimited("%s: dropped over-mtu packet: %d > %d\n",

				     netdev_vport->dev->name,

				     packet_length(skb), mtu);

		goto error;

		goto drop;

	}



	skb->dev = netdev_vport->dev;
@@ -179,9 +179,8 @@ static int netdev_send(struct vport *vport, struct sk_buff *skb) 


	return len;



error:

drop:

	kfree_skb(skb);

	ovs_vport_record_error(vport, VPORT_E_TX_DROPPED);

	return 0;

}

net/openvswitch/vport.c

+7 −2
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ int ovs_vport_send(struct vport *vport, struct sk_buff *skb) 
{

	int sent = vport->ops->send(vport, skb);



	if (likely(sent)) {

	if (likely(sent > 0)) {

		struct pcpu_tstats *stats;



		stats = this_cpu_ptr(vport->percpu_stats);
@@ -360,7 +360,12 @@ int ovs_vport_send(struct vport *vport, struct sk_buff *skb) 
		stats->tx_packets++;

		stats->tx_bytes += sent;

		u64_stats_update_end(&stats->syncp);

	}

	} else if (sent < 0) {

		ovs_vport_record_error(vport, VPORT_E_TX_ERROR);

		kfree_skb(skb);

	} else

		ovs_vport_record_error(vport, VPORT_E_TX_DROPPED);



	return sent;

}

net/openvswitch/vport.h

+2 −1
Original line number Diff line number Diff line
@@ -123,7 +123,8 @@ struct vport_parms { 
 * existing vport to a &struct sk_buff.  May be %NULL for a vport that does not

 * have any configuration.

 * @get_name: Get the device's name.

 * @send: Send a packet on the device.  Returns the length of the packet sent.

 * @send: Send a packet on the device.  Returns the length of the packet sent,

 * zero for dropped packets or negative for error.

 */

struct vport_ops {

	enum ovs_vport_type type;