|
|
@@ -34,9 +34,6 @@
|
|
|
#include "vport.h"
|
|
|
#include "vport-internal_dev.h"
|
|
|
|
|
|
-static void ovs_vport_record_error(struct vport *,
|
|
|
- enum vport_err_type err_type);
|
|
|
-
|
|
|
static LIST_HEAD(vport_ops_list);
|
|
|
|
|
|
/* Protected by RCU read lock for reading, ovs_mutex for writing. */
|
|
|
@@ -157,12 +154,6 @@ struct vport *ovs_vport_alloc(int priv_size, const struct vport_ops *ops,
|
|
|
return ERR_PTR(-EINVAL);
|
|
|
}
|
|
|
|
|
|
- vport->percpu_stats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);
|
|
|
- if (!vport->percpu_stats) {
|
|
|
- kfree(vport);
|
|
|
- return ERR_PTR(-ENOMEM);
|
|
|
- }
|
|
|
-
|
|
|
return vport;
|
|
|
}
|
|
|
EXPORT_SYMBOL_GPL(ovs_vport_alloc);
|
|
|
@@ -183,7 +174,6 @@ void ovs_vport_free(struct vport *vport)
|
|
|
* it is safe to use raw dereference.
|
|
|
*/
|
|
|
kfree(rcu_dereference_raw(vport->upcall_portids));
|
|
|
- free_percpu(vport->percpu_stats);
|
|
|
kfree(vport);
|
|
|
}
|
|
|
EXPORT_SYMBOL_GPL(ovs_vport_free);
|
|
|
@@ -290,30 +280,24 @@ void ovs_vport_del(struct vport *vport)
|
|
|
*/
|
|
|
void ovs_vport_get_stats(struct vport *vport, struct ovs_vport_stats *stats)
|
|
|
{
|
|
|
+ struct net_device *dev = vport->dev;
|
|
|
int i;
|
|
|
|
|
|
memset(stats, 0, sizeof(*stats));
|
|
|
+ stats->rx_errors = dev->stats.rx_errors;
|
|
|
+ stats->tx_errors = dev->stats.tx_errors;
|
|
|
+ stats->tx_dropped = dev->stats.tx_dropped;
|
|
|
+ stats->rx_dropped = dev->stats.rx_dropped;
|
|
|
|
|
|
- /* We potentially have 2 sources of stats that need to be combined:
|
|
|
- * those we have collected (split into err_stats and percpu_stats) from
|
|
|
- * set_stats() and device error stats from netdev->get_stats() (for
|
|
|
- * errors that happen downstream and therefore aren't reported through
|
|
|
- * our vport_record_error() function).
|
|
|
- * Stats from first source are reported by ovs (OVS_VPORT_ATTR_STATS).
|
|
|
- * netdev-stats can be directly read over netlink-ioctl.
|
|
|
- */
|
|
|
-
|
|
|
- stats->rx_errors = atomic_long_read(&vport->err_stats.rx_errors);
|
|
|
- stats->tx_errors = atomic_long_read(&vport->err_stats.tx_errors);
|
|
|
- stats->tx_dropped = atomic_long_read(&vport->err_stats.tx_dropped);
|
|
|
- stats->rx_dropped = atomic_long_read(&vport->err_stats.rx_dropped);
|
|
|
+ stats->rx_dropped += atomic_long_read(&dev->rx_dropped);
|
|
|
+ stats->tx_dropped += atomic_long_read(&dev->tx_dropped);
|
|
|
|
|
|
for_each_possible_cpu(i) {
|
|
|
const struct pcpu_sw_netstats *percpu_stats;
|
|
|
struct pcpu_sw_netstats local_stats;
|
|
|
unsigned int start;
|
|
|
|
|
|
- percpu_stats = per_cpu_ptr(vport->percpu_stats, i);
|
|
|
+ percpu_stats = per_cpu_ptr(dev->tstats, i);
|
|
|
|
|
|
do {
|
|
|
start = u64_stats_fetch_begin_irq(&percpu_stats->syncp);
|
|
|
@@ -468,94 +452,25 @@ u32 ovs_vport_find_upcall_portid(const struct vport *vport, struct sk_buff *skb)
|
|
|
* Must be called with rcu_read_lock. The packet cannot be shared and
|
|
|
* skb->data should point to the Ethernet header.
|
|
|
*/
|
|
|
-void ovs_vport_receive(struct vport *vport, struct sk_buff *skb,
|
|
|
- const struct ip_tunnel_info *tun_info)
|
|
|
+int ovs_vport_receive(struct vport *vport, struct sk_buff *skb,
|
|
|
+ const struct ip_tunnel_info *tun_info)
|
|
|
{
|
|
|
- struct pcpu_sw_netstats *stats;
|
|
|
struct sw_flow_key key;
|
|
|
int error;
|
|
|
|
|
|
- stats = this_cpu_ptr(vport->percpu_stats);
|
|
|
- u64_stats_update_begin(&stats->syncp);
|
|
|
- stats->rx_packets++;
|
|
|
- stats->rx_bytes += skb->len +
|
|
|
- (skb_vlan_tag_present(skb) ? VLAN_HLEN : 0);
|
|
|
- u64_stats_update_end(&stats->syncp);
|
|
|
-
|
|
|
OVS_CB(skb)->input_vport = vport;
|
|
|
OVS_CB(skb)->mru = 0;
|
|
|
/* Extract flow from 'skb' into 'key'. */
|
|
|
error = ovs_flow_key_extract(tun_info, skb, &key);
|
|
|
if (unlikely(error)) {
|
|
|
kfree_skb(skb);
|
|
|
- return;
|
|
|
+ return error;
|
|
|
}
|
|
|
ovs_dp_process_packet(skb, &key);
|
|
|
+ return 0;
|
|
|
}
|
|
|
EXPORT_SYMBOL_GPL(ovs_vport_receive);
|
|
|
|
|
|
-/**
|
|
|
- * ovs_vport_send - send a packet on a device
|
|
|
- *
|
|
|
- * @vport: vport on which to send the packet
|
|
|
- * @skb: skb to send
|
|
|
- *
|
|
|
- * Sends the given packet and returns the length of data sent. Either ovs
|
|
|
- * lock or rcu_read_lock must be held.
|
|
|
- */
|
|
|
-int ovs_vport_send(struct vport *vport, struct sk_buff *skb)
|
|
|
-{
|
|
|
- int sent = vport->ops->send(vport, skb);
|
|
|
-
|
|
|
- if (likely(sent > 0)) {
|
|
|
- struct pcpu_sw_netstats *stats;
|
|
|
-
|
|
|
- stats = this_cpu_ptr(vport->percpu_stats);
|
|
|
-
|
|
|
- u64_stats_update_begin(&stats->syncp);
|
|
|
- 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);
|
|
|
- } else {
|
|
|
- ovs_vport_record_error(vport, VPORT_E_TX_DROPPED);
|
|
|
- }
|
|
|
- return sent;
|
|
|
-}
|
|
|
-
|
|
|
-/**
|
|
|
- * ovs_vport_record_error - indicate device error to generic stats layer
|
|
|
- *
|
|
|
- * @vport: vport that encountered the error
|
|
|
- * @err_type: one of enum vport_err_type types to indicate the error type
|
|
|
- *
|
|
|
- * If using the vport generic stats layer indicate that an error of the given
|
|
|
- * type has occurred.
|
|
|
- */
|
|
|
-static void ovs_vport_record_error(struct vport *vport,
|
|
|
- enum vport_err_type err_type)
|
|
|
-{
|
|
|
- switch (err_type) {
|
|
|
- case VPORT_E_RX_DROPPED:
|
|
|
- atomic_long_inc(&vport->err_stats.rx_dropped);
|
|
|
- break;
|
|
|
-
|
|
|
- case VPORT_E_RX_ERROR:
|
|
|
- atomic_long_inc(&vport->err_stats.rx_errors);
|
|
|
- break;
|
|
|
-
|
|
|
- case VPORT_E_TX_DROPPED:
|
|
|
- atomic_long_inc(&vport->err_stats.tx_dropped);
|
|
|
- break;
|
|
|
-
|
|
|
- case VPORT_E_TX_ERROR:
|
|
|
- atomic_long_inc(&vport->err_stats.tx_errors);
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
-}
|
|
|
-
|
|
|
static void free_vport_rcu(struct rcu_head *rcu)
|
|
|
{
|
|
|
struct vport *vport = container_of(rcu, struct vport, rcu);
|
Pravin B Shelar