mirror of
https://github.com/tbsdtv/linux_media.git
synced 2025-07-23 12:43:29 +02:00
tap: Abstract type of virtual interface from tap implementation
macvlan object is re-structured to hold tap related elements in a separate entity, tap_dev. Upon NETDEV_REGISTER device_event, tap_dev is registered with idr and fetched again on tap_open. Few of the tap functions are modified to accepted tap_dev as argument. tap_dev object includes callbacks to be used by underlying virtual interface to take care of tx and rx accounting. Signed-off-by: Sainath Grandhi <sainath.grandhi@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
ebc05ba7e8
commit
6fe3faf867
@@ -14,11 +14,60 @@ static inline struct socket *tap_get_socket(struct file *f)
|
||||
}
|
||||
#endif /* CONFIG_MACVTAP */
|
||||
|
||||
#include <net/sock.h>
|
||||
#include <linux/skb_array.h>
|
||||
|
||||
#define MAX_TAP_QUEUES 256
|
||||
|
||||
struct tap_queue;
|
||||
|
||||
struct tap_dev {
|
||||
struct net_device *dev;
|
||||
u16 flags;
|
||||
/* This array tracks active taps. */
|
||||
struct tap_queue __rcu *taps[MAX_TAP_QUEUES];
|
||||
/* This list tracks all taps (both enabled and disabled) */
|
||||
struct list_head queue_list;
|
||||
int numvtaps;
|
||||
int numqueues;
|
||||
netdev_features_t tap_features;
|
||||
int minor;
|
||||
|
||||
void (*update_features)(struct tap_dev *tap, netdev_features_t features);
|
||||
void (*count_tx_dropped)(struct tap_dev *tap);
|
||||
void (*count_rx_dropped)(struct tap_dev *tap);
|
||||
};
|
||||
|
||||
/*
|
||||
* A tap queue is the central object of tap module, it connects
|
||||
* an open character device to virtual interface. There can be
|
||||
* multiple queues on one interface, which map back to queues
|
||||
* implemented in hardware on the underlying device.
|
||||
*
|
||||
* tap_proto is used to allocate queues through the sock allocation
|
||||
* mechanism.
|
||||
*
|
||||
*/
|
||||
|
||||
struct tap_queue {
|
||||
struct sock sk;
|
||||
struct socket sock;
|
||||
struct socket_wq wq;
|
||||
int vnet_hdr_sz;
|
||||
struct tap_dev __rcu *tap;
|
||||
struct file *file;
|
||||
unsigned int flags;
|
||||
u16 queue_index;
|
||||
bool enabled;
|
||||
struct list_head next;
|
||||
struct skb_array skb_array;
|
||||
};
|
||||
|
||||
rx_handler_result_t tap_handle_frame(struct sk_buff **pskb);
|
||||
void tap_del_queues(struct net_device *dev);
|
||||
int tap_get_minor(struct macvlan_dev *vlan);
|
||||
void tap_free_minor(struct macvlan_dev *vlan);
|
||||
int tap_queue_resize(struct macvlan_dev *vlan);
|
||||
void tap_del_queues(struct tap_dev *tap);
|
||||
int tap_get_minor(struct tap_dev *tap);
|
||||
void tap_free_minor(struct tap_dev *tap);
|
||||
int tap_queue_resize(struct tap_dev *tap);
|
||||
int tap_create_cdev(struct cdev *tap_cdev,
|
||||
dev_t *tap_major, const char *device_name);
|
||||
void tap_destroy_cdev(dev_t major, struct cdev *tap_cdev);
|
||||
|
Reference in New Issue
Block a user