Commit 70063e94 authored by David S. Miller's avatar David S. Miller

Merge branch 'ldmvsw'

Aaron Young says:

====================
ldmvsw: Add ldmvsw driver

This series adds a new Logical Domains vSwitch (ldmvsw) driver.

The ldmvsw driver code will live in the drivers/net/ethernet/sun/
directory and will operate on Oracle systems running SPARC Linux in a
Logical Domains environment (typically in the control domain).

The ldmvsw driver is very similar in function to the existing sunvnet
driver. Ldmvsw creates a network interface for each "vsw-port" node
found in the Machine Description (MD) of a service domain. These
nodes correspond to ports on a vswitch created by the logical domains
manager. The created network interface(s) can be used by bridge/vswitch
software (such as the Linux bridge or Open vSwitch) to provide
guest domain(s) with network interconnectivity or connectivity
to a physical network.

Here is a example diagram of ldmvsw driver usage in a logical
domain environment to provide a guest domain with network connectivity
to a physical NIC on the service domain:

   +----------------+             +-----------------
   | Service Domain |             |  Guest domain  |
   |                |             |                |
   |  LinuxBridge   |             |                |
   |    |    |      |             |                |
   |   NIC Ldmvsw   |             |    Sunvnet     |
   +----------------+             +----------------+
        |    |           LDC              |
       LAN   ------------------------------

As stated, the sunvnet and ldmvsw drivers are _very_ similar in function.
They both create network interface(s) to receive/transmit network
traffic across LDC network channel(s). Since the driver is so similar
in function to sunvnet, the approach will be as follows to integrate
the driver and take advantage of common code:

Patch #1: Split sunvnet.c driver into sunvnet.c and sunvnet_common.c
Patch #2: Modify the sunvnet_common code and data structures to be compatible
          with both the sunvnet and ldmvsw drivers.
Patch #3: Add the new ldmvsw.c driver code
Patch #4: Checkpatch cleanup of the sunvnet/sunvnet_common code.

NOTE - Patch#1 renames a file (sunvnet.h -> sunvnet_common.h). When generating
the patches (using git format-patch), I had to use the --no-renames option
otherwise patch#1 would NOT apply using 'patch -p1' - which as I
understand is a requirement for patch acceptance. I wasn't sure if this
is proper thing to do.  Please advise if not. Thanks.

v2 changes:
  * change all EXPORT_SYMBOL declarations to EXPORT_SYMBOL_GPL
  * remove inline attribute for external function port_is_up_common()
  * Give all exported/global funcs in sunvnet_common.c a 'sunvnet_' prefix
    to avoid kernel global namespace pollution/collisions
  * ldmvsw.c: Order local variable declarations from longest to shortest line
  * ldmvsw.c: register the netdevice after all supporting state is ready/setup.
              NOTE: The consensus at Oracle is that the following functions
                    must be done AFTER register_netdev() - this is the same
                    ordering currently used in the sunvnet driver:
                    1. sunvnet_port_add_txq_common() - needs registered netdev
                    2. napi_enable() - requires registered netdev
                    3. vio_port_up() - as soon as this function is called
                                       LDC handshake messages will come in
                                       which must be handled by the napi code.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1e6bb1a3 dc153f85
...@@ -102,6 +102,7 @@ CONFIG_SUNLANCE=m ...@@ -102,6 +102,7 @@ CONFIG_SUNLANCE=m
CONFIG_HAPPYMEAL=m CONFIG_HAPPYMEAL=m
CONFIG_SUNGEM=m CONFIG_SUNGEM=m
CONFIG_SUNVNET=m CONFIG_SUNVNET=m
CONFIG_LDMVSW=m
CONFIG_NET_PCI=y CONFIG_NET_PCI=y
CONFIG_E1000=m CONFIG_E1000=m
CONFIG_E1000E=m CONFIG_E1000E=m
......
...@@ -69,12 +69,28 @@ config CASSINI ...@@ -69,12 +69,28 @@ config CASSINI
Support for the Sun Cassini chip, aka Sun GigaSwift Ethernet. See also Support for the Sun Cassini chip, aka Sun GigaSwift Ethernet. See also
<http://docs.oracle.com/cd/E19113-01/giga.ether.pci/817-4341-10/817-4341-10.pdf>. <http://docs.oracle.com/cd/E19113-01/giga.ether.pci/817-4341-10/817-4341-10.pdf>.
config SUNVNET_COMMON
bool
depends on SUN_LDOMS
default y if SUN_LDOMS
config SUNVNET config SUNVNET
tristate "Sun Virtual Network support" tristate "Sun Virtual Network support"
depends on SUN_LDOMS depends on SUN_LDOMS
---help--- ---help---
Support for virtual network devices under Sun Logical Domains. Support for virtual network devices under Sun Logical Domains.
config LDMVSW
tristate "Sun4v LDoms Virtual Switch support"
depends on SUN_LDOMS
---help---
Support for virtual switch devices under Sun4v Logical Domains.
This driver adds a network interface for every vsw-port node
found in the machine description of a service domain.
Linux bridge/switch software can use these interfaces for
guest domain network interconnectivity or guest domain
connection to a physical network on a service domain.
config NIU config NIU
tristate "Sun Neptune 10Gbit Ethernet support" tristate "Sun Neptune 10Gbit Ethernet support"
depends on PCI depends on PCI
......
...@@ -7,5 +7,7 @@ obj-$(CONFIG_SUNQE) += sunqe.o ...@@ -7,5 +7,7 @@ obj-$(CONFIG_SUNQE) += sunqe.o
obj-$(CONFIG_SUNBMAC) += sunbmac.o obj-$(CONFIG_SUNBMAC) += sunbmac.o
obj-$(CONFIG_SUNGEM) += sungem.o obj-$(CONFIG_SUNGEM) += sungem.o
obj-$(CONFIG_CASSINI) += cassini.o obj-$(CONFIG_CASSINI) += cassini.o
obj-$(CONFIG_SUNVNET_COMMON) += sunvnet_common.o
obj-$(CONFIG_SUNVNET) += sunvnet.o obj-$(CONFIG_SUNVNET) += sunvnet.o
obj-$(CONFIG_LDMVSW) += ldmvsw.o
obj-$(CONFIG_NIU) += niu.o obj-$(CONFIG_NIU) += niu.o
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
#ifndef _SUNVNET_H #ifndef _SUNVNETCOMMON_H
#define _SUNVNET_H #define _SUNVNETCOMMON_H
#include <linux/interrupt.h> #include <linux/interrupt.h>
#define DESC_NCOOKIES(entry_size) \
((entry_size) - sizeof(struct vio_net_desc))
/* length of time before we decide the hardware is borked,
* and dev->tx_timeout() should be called to fix the problem
*/
#define VNET_TX_TIMEOUT (5 * HZ)
/* length of time (or less) we expect pending descriptors to be marked /* length of time (or less) we expect pending descriptors to be marked
* as VIO_DESC_DONE and skbs ready to be freed * as VIO_DESC_DONE and skbs ready to be freed
*/ */
#define VNET_CLEAN_TIMEOUT ((HZ/100)+1) #define VNET_CLEAN_TIMEOUT ((HZ / 100) + 1)
#define VNET_MAXPACKET (65535ULL + ETH_HLEN + VLAN_HLEN) #define VNET_MAXPACKET (65535ULL + ETH_HLEN + VLAN_HLEN)
#define VNET_TX_RING_SIZE 512 #define VNET_TX_RING_SIZE 512
...@@ -29,7 +21,9 @@ ...@@ -29,7 +21,9 @@
*/ */
#define VNET_PACKET_SKIP 6 #define VNET_PACKET_SKIP 6
#define VNET_MAXCOOKIES (VNET_MAXPACKET/PAGE_SIZE + 1) #define VNET_MAXCOOKIES (VNET_MAXPACKET / PAGE_SIZE + 1)
#define VNET_MAX_TXQS 16
struct vnet_tx_entry { struct vnet_tx_entry {
struct sk_buff *skb; struct sk_buff *skb;
...@@ -38,6 +32,13 @@ struct vnet_tx_entry { ...@@ -38,6 +32,13 @@ struct vnet_tx_entry {
}; };
struct vnet; struct vnet;
/* Structure to describe a vnet-port or vsw-port in the MD.
* If the vsw bit is set, this structure represents a vswitch
* port, and the net_device can be found from ->dev. If the
* vsw bit is not set, the net_device is available from ->vp->dev.
* See the VNET_PORT_TO_NET_DEVICE macro below.
*/
struct vnet_port { struct vnet_port {
struct vio_driver_state vio; struct vio_driver_state vio;
...@@ -45,9 +46,11 @@ struct vnet_port { ...@@ -45,9 +46,11 @@ struct vnet_port {
u8 raddr[ETH_ALEN]; u8 raddr[ETH_ALEN];
unsigned switch_port:1; unsigned switch_port:1;
unsigned tso:1; unsigned tso:1;
unsigned __pad:14; unsigned vsw:1;
unsigned __pad:13;
struct vnet *vp; struct vnet *vp;
struct net_device *dev;
struct vnet_tx_entry tx_bufs[VNET_TX_RING_SIZE]; struct vnet_tx_entry tx_bufs[VNET_TX_RING_SIZE];
...@@ -111,4 +114,32 @@ struct vnet { ...@@ -111,4 +114,32 @@ struct vnet {
int nports; int nports;
}; };
#endif /* _SUNVNET_H */ /* Def used by common code to get the net_device from the proper location */
#define VNET_PORT_TO_NET_DEVICE(__port) \
((__port)->vsw ? (__port)->dev : (__port)->vp->dev)
/* Common funcs */
void sunvnet_clean_timer_expire_common(unsigned long port0);
int sunvnet_open_common(struct net_device *dev);
int sunvnet_close_common(struct net_device *dev);
void sunvnet_set_rx_mode_common(struct net_device *dev, struct vnet *vp);
int sunvnet_set_mac_addr_common(struct net_device *dev, void *p);
void sunvnet_tx_timeout_common(struct net_device *dev);
int sunvnet_change_mtu_common(struct net_device *dev, int new_mtu);
int sunvnet_start_xmit_common(struct sk_buff *skb, struct net_device *dev,
struct vnet_port *(*vnet_tx_port)
(struct sk_buff *, struct net_device *));
#ifdef CONFIG_NET_POLL_CONTROLLER
void sunvnet_poll_controller_common(struct net_device *dev, struct vnet *vp);
#endif
void sunvnet_event_common(void *arg, int event);
int sunvnet_send_attr_common(struct vio_driver_state *vio);
int sunvnet_handle_attr_common(struct vio_driver_state *vio, void *arg);
void sunvnet_handshake_complete_common(struct vio_driver_state *vio);
int sunvnet_poll_common(struct napi_struct *napi, int budget);
void sunvnet_port_free_tx_bufs_common(struct vnet_port *port);
bool sunvnet_port_is_up_common(struct vnet_port *vnet);
void sunvnet_port_add_txq_common(struct vnet_port *port);
void sunvnet_port_rm_txq_common(struct vnet_port *port);
#endif /* _SUNVNETCOMMON_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment