git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: Always use generic stats for devices (vports)
[sliver-openvswitch.git]
/
datapath
/
vport-internal_dev.c
diff --git
a/datapath/vport-internal_dev.c
b/datapath/vport-internal_dev.c
index
b4dacd0
..
ecfb379
100644
(file)
--- a/
datapath/vport-internal_dev.c
+++ b/
datapath/vport-internal_dev.c
@@
-1,20
+1,23
@@
/*
/*
- * Copyright (c) 2009, 2010 Nicira Networks.
+ * Copyright (c) 2009, 2010
, 2011
Nicira Networks.
* Distributed under the terms of the GNU GPL version 2.
*
* Significant portions of this file may be copied from parts of the Linux
* kernel, by Linus Torvalds and others.
*/
* Distributed under the terms of the GNU GPL version 2.
*
* Significant portions of this file may be copied from parts of the Linux
* kernel, by Linus Torvalds and others.
*/
+#include <linux/hardirq.h>
+#include <linux/if_vlan.h>
#include <linux/kernel.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/ethtool.h>
#include <linux/kernel.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/ethtool.h>
-#include <linux/rcupdate.h>
#include <linux/skbuff.h>
#include <linux/version.h>
#include <linux/skbuff.h>
#include <linux/version.h>
+#include "checksum.h"
#include "datapath.h"
#include "datapath.h"
+#include "vlan.h"
#include "vport-generic.h"
#include "vport-internal_dev.h"
#include "vport-netdev.h"
#include "vport-generic.h"
#include "vport-internal_dev.h"
#include "vport-netdev.h"
@@
-29,16
+32,14
@@
static inline struct internal_dev *internal_dev_priv(struct net_device *netdev)
return netdev_priv(netdev);
}
return netdev_priv(netdev);
}
-/* This function is only called by the kernel network layer. It is not a vport
- * get_stats() function. If a vport get_stats() function is defined that
- * results in this being called it will cause infinite recursion. */
+/* This function is only called by the kernel network layer.*/
static struct net_device_stats *internal_dev_sys_stats(struct net_device *netdev)
{
struct vport *vport = internal_dev_get_vport(netdev);
struct net_device_stats *stats = &internal_dev_priv(netdev)->stats;
if (vport) {
static struct net_device_stats *internal_dev_sys_stats(struct net_device *netdev)
{
struct vport *vport = internal_dev_get_vport(netdev);
struct net_device_stats *stats = &internal_dev_priv(netdev)->stats;
if (vport) {
- struct
rtnl_link_stats64
vport_stats;
+ struct
ovs_vport_stats
vport_stats;
vport_get_stats(vport, &vport_stats);
vport_get_stats(vport, &vport_stats);
@@
-52,7
+53,6
@@
static struct net_device_stats *internal_dev_sys_stats(struct net_device *netdev
stats->tx_errors = vport_stats.rx_errors;
stats->rx_dropped = vport_stats.tx_dropped;
stats->tx_dropped = vport_stats.rx_dropped;
stats->tx_errors = vport_stats.rx_errors;
stats->rx_dropped = vport_stats.tx_dropped;
stats->tx_dropped = vport_stats.rx_dropped;
- stats->collisions = vport_stats.collisions;
}
return stats;
}
return stats;
@@
-71,13
+71,15
@@
static int internal_dev_mac_addr(struct net_device *dev, void *p)
/* Called with rcu_read_lock and bottom-halves disabled. */
static int internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev)
{
/* Called with rcu_read_lock and bottom-halves disabled. */
static int internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev)
{
- struct internal_dev *internal_dev = internal_dev_priv(netdev);
- struct vport *vport = rcu_dereference(internal_dev->vport);
+ if (unlikely(compute_ip_summed(skb, true))) {
+ kfree_skb(skb);
+ return 0;
+ }
-
compute_ip_summed(skb, true
);
+
vlan_copy_skb_tci(skb
);
OVS_CB(skb)->flow = NULL;
OVS_CB(skb)->flow = NULL;
- vport_receive(vport, skb);
+ vport_receive(
internal_dev_priv(netdev)->
vport, skb);
return 0;
}
return 0;
}
@@
-96,10
+98,7
@@
static int internal_dev_stop(struct net_device *netdev)
static void internal_dev_getinfo(struct net_device *netdev,
struct ethtool_drvinfo *info)
{
static void internal_dev_getinfo(struct net_device *netdev,
struct ethtool_drvinfo *info)
{
- struct vport *vport = internal_dev_get_vport(netdev);
-
strcpy(info->driver, "openvswitch");
strcpy(info->driver, "openvswitch");
- sprintf(info->bus_info, "%d.%d", vport->dp->dp_idx, vport->port_no);
}
static const struct ethtool_ops internal_dev_ethtool_ops = {
}
static const struct ethtool_ops internal_dev_ethtool_ops = {
@@
-115,14
+114,9
@@
static const struct ethtool_ops internal_dev_ethtool_ops = {
static int internal_dev_change_mtu(struct net_device *netdev, int new_mtu)
{
static int internal_dev_change_mtu(struct net_device *netdev, int new_mtu)
{
- struct vport *vport = internal_dev_get_vport(netdev);
-
if (new_mtu < 68)
return -EINVAL;
if (new_mtu < 68)
return -EINVAL;
- if (new_mtu > dp_min_mtu(vport->dp))
- return -EINVAL;
-
netdev->mtu = new_mtu;
return 0;
}
netdev->mtu = new_mtu;
return 0;
}
@@
-135,6
+129,14
@@
static int internal_dev_do_ioctl(struct net_device *dev, struct ifreq *ifr, int
return -EOPNOTSUPP;
}
return -EOPNOTSUPP;
}
+static void internal_dev_destructor(struct net_device *dev)
+{
+ struct vport *vport = internal_dev_get_vport(dev);
+
+ vport_free(vport);
+ free_netdev(dev);
+}
+
#ifdef HAVE_NET_DEVICE_OPS
static const struct net_device_ops internal_dev_netdev_ops = {
.ndo_open = internal_dev_open,
#ifdef HAVE_NET_DEVICE_OPS
static const struct net_device_ops internal_dev_netdev_ops = {
.ndo_open = internal_dev_open,
@@
-163,7
+165,7
@@
static void do_setup(struct net_device *netdev)
netdev->change_mtu = internal_dev_change_mtu;
#endif
netdev->change_mtu = internal_dev_change_mtu;
#endif
- netdev->destructor =
free_netdev
;
+ netdev->destructor =
internal_dev_destructor
;
SET_ETHTOOL_OPS(netdev, &internal_dev_ethtool_ops);
netdev->tx_queue_len = 0;
SET_ETHTOOL_OPS(netdev, &internal_dev_ethtool_ops);
netdev->tx_queue_len = 0;
@@
-171,6
+173,11
@@
static void do_setup(struct net_device *netdev)
netdev->features = NETIF_F_LLTX | NETIF_F_SG | NETIF_F_FRAGLIST |
NETIF_F_HIGHDMA | NETIF_F_HW_CSUM | NETIF_F_TSO;
netdev->features = NETIF_F_LLTX | NETIF_F_SG | NETIF_F_FRAGLIST |
NETIF_F_HIGHDMA | NETIF_F_HW_CSUM | NETIF_F_TSO;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
+ netdev->vlan_features = netdev->features;
+ netdev->features |= NETIF_F_HW_VLAN_TX;
+#endif
+
vport_gen_rand_ether_addr(netdev->dev_addr);
}
vport_gen_rand_ether_addr(netdev->dev_addr);
}
@@
-196,7
+203,7
@@
static struct vport *internal_dev_create(const struct vport_parms *parms)
}
internal_dev = internal_dev_priv(netdev_vport->dev);
}
internal_dev = internal_dev_priv(netdev_vport->dev);
-
rcu_assign_pointer(internal_dev->vport, vport)
;
+
internal_dev->vport = vport
;
err = register_netdevice(netdev_vport->dev);
if (err)
err = register_netdevice(netdev_vport->dev);
if (err)
@@
-215,19
+222,15
@@
error:
return ERR_PTR(err);
}
return ERR_PTR(err);
}
-static
int
internal_dev_destroy(struct vport *vport)
+static
void
internal_dev_destroy(struct vport *vport)
{
struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
netif_stop_queue(netdev_vport->dev);
dev_set_promiscuity(netdev_vport->dev, -1);
{
struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
netif_stop_queue(netdev_vport->dev);
dev_set_promiscuity(netdev_vport->dev, -1);
- synchronize_rcu();
-
+ /* unregister_netdevice() waits for an RCU grace period. */
unregister_netdevice(netdev_vport->dev);
unregister_netdevice(netdev_vport->dev);
- vport_free(vport);
-
- return 0;
}
static int internal_dev_recv(struct vport *vport, struct sk_buff *skb)
}
static int internal_dev_recv(struct vport *vport, struct sk_buff *skb)
@@
-235,10
+238,16
@@
static int internal_dev_recv(struct vport *vport, struct sk_buff *skb)
struct net_device *netdev = netdev_vport_priv(vport)->dev;
int len;
struct net_device *netdev = netdev_vport_priv(vport)->dev;
int len;
- skb->dev = netdev;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
+ if (unlikely(vlan_deaccel_tag(skb)))
+ return 0;
+#endif
+
len = skb->len;
len = skb->len;
+ skb->dev = netdev;
skb->pkt_type = PACKET_HOST;
skb->protocol = eth_type_trans(skb, netdev);
skb->pkt_type = PACKET_HOST;
skb->protocol = eth_type_trans(skb, netdev);
+ forward_ip_summed(skb, false);
if (in_interrupt())
netif_rx(skb);
if (in_interrupt())
netif_rx(skb);
@@
-253,11
+262,10
@@
static int internal_dev_recv(struct vport *vport, struct sk_buff *skb)
}
const struct vport_ops internal_vport_ops = {
}
const struct vport_ops internal_vport_ops = {
- .type =
"internal"
,
- .flags = VPORT_F_REQUIRED | VPORT_F_
GEN_STATS | VPORT_F_
FLOW,
+ .type =
OVS_VPORT_TYPE_INTERNAL
,
+ .flags = VPORT_F_REQUIRED | VPORT_F_FLOW,
.create = internal_dev_create,
.destroy = internal_dev_destroy,
.create = internal_dev_create,
.destroy = internal_dev_destroy,
- .set_mtu = netdev_set_mtu,
.set_addr = netdev_set_addr,
.get_name = netdev_get_name,
.get_addr = netdev_get_addr,
.set_addr = netdev_set_addr,
.get_name = netdev_get_name,
.get_addr = netdev_get_addr,
@@
-266,7
+274,6
@@
const struct vport_ops internal_vport_ops = {
.is_running = netdev_is_running,
.get_operstate = netdev_get_operstate,
.get_ifindex = netdev_get_ifindex,
.is_running = netdev_is_running,
.get_operstate = netdev_get_operstate,
.get_ifindex = netdev_get_ifindex,
- .get_iflink = netdev_get_iflink,
.get_mtu = netdev_get_mtu,
.send = internal_dev_recv,
};
.get_mtu = netdev_get_mtu,
.send = internal_dev_recv,
};
@@
-287,11
+294,8
@@
int is_internal_vport(const struct vport *vport)
struct vport *internal_dev_get_vport(struct net_device *netdev)
{
struct vport *internal_dev_get_vport(struct net_device *netdev)
{
- struct internal_dev *internal_dev;
-
if (!is_internal_dev(netdev))
return NULL;
if (!is_internal_dev(netdev))
return NULL;
- internal_dev = internal_dev_priv(netdev);
- return rcu_dereference(internal_dev->vport);
+ return internal_dev_priv(netdev)->vport;
}
}