forked from Minki/linux
67d0719f06
Modify sunvnet common code and data structures to be compatible with both sunvnet and ldmvsw drivers. Details: Sunvnet operates on "vnet-port" nodes which appear in the Machine Description (MD) in a guest domain. Ldmvsw operates on "vsw-port" nodes which appear in the MD of a service domain. A difference between the sunvnet driver and the ldmvsw driver is the sunvnet driver creates a network interface (i.e. a struct net_device) for every vnet-port *parent* "network" node. Several vnet-ports may appear under this common parent network node - each corresponding to a common parent network interface. Conversely, since bridge/vswitch software will need to interface with every vsw-port in a system, the ldmvsw driver creates a network interface (i.e. a struct net_device) for every vsw-port - not every parent node as with sunvnet. This difference required some special handling in the common code as explained below. There are 2 key data structures used by the sunvnet and ldmvsw drivers (which are now found in sunvnet_common.h): 1. struct vnet_port This structure represents a vnet-port node in sunvnet and a vsw-port in the ldmvsw driver. 2. struct vnet This structure represents a parent "network" node in sunvnet and a parent "virtual-network-switch" node in ldmvsw. Since the sunvnet driver allocates a net_device for every parent "network" node, a net_device member appears in the struct vnet. Since the ldmvsw driver allocates a net_device for every port, a net_device member was added to the vnet_port. The common code distinguishes which structure net_device member to use by checking a 'vsw' bit that was added to the vnet_port structure. See the VNET_PORT_TO_NET_DEVICE() marco in sunvnet_common.h. The netdev_priv() in sunvnet is allocated as a vnet. The netdev_priv() in ldmvsw is a vnet_port. Therefore, any place in the common code where a netdev_priv() call was made, a wrapper function was implemented in each driver to first get the vnet and/or vnet_port (in a driver specific way) and pass them as newly added parameters to the common functions (see wrapper funcs: vnet_set_rx_mode() and vnet_poll_controller()). Since these wrapper functions call __tx_port_find(), __tx_port_find() was moved from the common code back into sunvnet.c. Note - ldmvsw.c does not require this function. These changes also required that port_is_up() be made into a common function and thus it was given a _common suffix and exported like the other common functions. A wrapper function was also added for vnet_start_xmit_common() to pass a driver-specific function arg to return the port associated with a given struct sk_buff and struct net_device. This was required because vnet_start_xmit_common() grabs a lock prior to getting the associated port. Using a function pointer arg allowed the code to work unchanged without risking changes to the non-trivial locking logic in vnet_start_xmit_common(). Signed-off-by: Aaron Young <aaron.young@oracle.com> Signed-off-by: Rashmi Narasimhan <rashmi.narasimhan@oracle.com> Reviewed-by: Sowmini Varadhan <sowmini.varadhan@oracle.com> Reviewed-by: Alexandre Chartre <Alexandre.Chartre@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
146 lines
3.9 KiB
C
146 lines
3.9 KiB
C
#ifndef _SUNVNETCOMMON_H
|
|
#define _SUNVNETCOMMON_H
|
|
|
|
#include <linux/interrupt.h>
|
|
|
|
/* length of time (or less) we expect pending descriptors to be marked
|
|
* as VIO_DESC_DONE and skbs ready to be freed
|
|
*/
|
|
#define VNET_CLEAN_TIMEOUT ((HZ / 100) + 1)
|
|
|
|
#define VNET_MAXPACKET (65535ULL + ETH_HLEN + VLAN_HLEN)
|
|
#define VNET_TX_RING_SIZE 512
|
|
#define VNET_TX_WAKEUP_THRESH(dr) ((dr)->pending / 4)
|
|
|
|
#define VNET_MINTSO 2048 /* VIO protocol's minimum TSO len */
|
|
#define VNET_MAXTSO 65535 /* VIO protocol's maximum TSO len */
|
|
|
|
/* VNET packets are sent in buffers with the first 6 bytes skipped
|
|
* so that after the ethernet header the IPv4/IPv6 headers are aligned
|
|
* properly.
|
|
*/
|
|
#define VNET_PACKET_SKIP 6
|
|
|
|
#define VNET_MAXCOOKIES (VNET_MAXPACKET / PAGE_SIZE + 1)
|
|
|
|
#define VNET_MAX_TXQS 16
|
|
|
|
struct vnet_tx_entry {
|
|
struct sk_buff *skb;
|
|
unsigned int ncookies;
|
|
struct ldc_trans_cookie cookies[VNET_MAXCOOKIES];
|
|
};
|
|
|
|
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 vio_driver_state vio;
|
|
|
|
struct hlist_node hash;
|
|
u8 raddr[ETH_ALEN];
|
|
unsigned switch_port:1;
|
|
unsigned tso:1;
|
|
unsigned vsw:1;
|
|
unsigned __pad:13;
|
|
|
|
struct vnet *vp;
|
|
struct net_device *dev;
|
|
|
|
struct vnet_tx_entry tx_bufs[VNET_TX_RING_SIZE];
|
|
|
|
struct list_head list;
|
|
|
|
u32 stop_rx_idx;
|
|
bool stop_rx;
|
|
bool start_cons;
|
|
|
|
struct timer_list clean_timer;
|
|
|
|
u64 rmtu;
|
|
u16 tsolen;
|
|
|
|
struct napi_struct napi;
|
|
u32 napi_stop_idx;
|
|
bool napi_resume;
|
|
int rx_event;
|
|
u16 q_index;
|
|
};
|
|
|
|
static inline struct vnet_port *to_vnet_port(struct vio_driver_state *vio)
|
|
{
|
|
return container_of(vio, struct vnet_port, vio);
|
|
}
|
|
|
|
#define VNET_PORT_HASH_SIZE 16
|
|
#define VNET_PORT_HASH_MASK (VNET_PORT_HASH_SIZE - 1)
|
|
|
|
static inline unsigned int vnet_hashfn(u8 *mac)
|
|
{
|
|
unsigned int val = mac[4] ^ mac[5];
|
|
|
|
return val & (VNET_PORT_HASH_MASK);
|
|
}
|
|
|
|
struct vnet_mcast_entry {
|
|
u8 addr[ETH_ALEN];
|
|
u8 sent;
|
|
u8 hit;
|
|
struct vnet_mcast_entry *next;
|
|
};
|
|
|
|
struct vnet {
|
|
/* Protects port_list and port_hash. */
|
|
spinlock_t lock;
|
|
|
|
struct net_device *dev;
|
|
|
|
u32 msg_enable;
|
|
|
|
struct list_head port_list;
|
|
|
|
struct hlist_head port_hash[VNET_PORT_HASH_SIZE];
|
|
|
|
struct vnet_mcast_entry *mcast_list;
|
|
|
|
struct list_head list;
|
|
u64 local_mac;
|
|
|
|
int nports;
|
|
};
|
|
|
|
/* 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 */
|