#include <linux/virtio_net.h>
#include <linux/vhost.h>
#include <sys/eventfd.h>
+#include <net/if_arp.h>
#include <sched.h>
+#include <limits.h>
#include <linux/netlink.h>
#include <linux/rtnetlink.h>
#include <vlib/vlib.h>
+#include <vlib/physmem.h>
#include <vlib/unix/unix.h>
#include <vnet/ethernet/ethernet.h>
#include <vnet/ip/ip4_packet.h>
tap_main_t tap_main;
+#define tap_log_err(dev, f, ...) \
+ vlib_log (VLIB_LOG_LEVEL_ERR, tap_main.log_default, "tap%u: " f, dev->dev_instance, ## __VA_ARGS__)
+#define tap_log_dbg(dev, f, ...) \
+ vlib_log (VLIB_LOG_LEVEL_DEBUG, tap_main.log_default, "tap%u: " f, dev->dev_instance, ## __VA_ARGS__)
+
#define _IOCTL(fd,a,...) \
if (ioctl (fd, a, __VA_ARGS__) < 0) \
{ \
err = clib_error_return_unix (0, "ioctl(" #a ")"); \
+ tap_log_err (vif, "%U", format_clib_error, err); \
goto error; \
}
return 0;
}
-void vl_api_rpc_call_main_thread (void *fp, u8 * data, u32 data_length);
-
-static clib_error_t *
-call_tap_read_ready (clib_file_t * uf)
-{
- /* nothing to do */
- return 0;
-}
-
-static void
-tap_delete_if_cp (u32 * sw_if_index)
-{
- vlib_main_t *vm = vlib_get_main ();
- tap_delete_if (vm, *sw_if_index);
-}
-
-/*
- * Tap clean-up routine:
- * Linux side of tap interface can be deleted i.e. tap is
- * attached to container and if someone will delete this
- * container, will also removes tap interface. While VPP
- * will have other side of tap. This function will RPC
- * main thread to call the tap_delete_if to cleanup tap.
- */
-static clib_error_t *
-call_tap_error_ready (clib_file_t * uf)
-{
- vl_api_rpc_call_main_thread (tap_delete_if_cp, (u8 *) & uf->private_data,
- sizeof (uf->private_data));
- return 0;
-}
-
static int
open_netns_fd (char *netns)
{
#define TAP_MAX_INSTANCE 1024
+static void
+tap_free (vlib_main_t * vm, virtio_if_t * vif)
+{
+ virtio_main_t *mm = &virtio_main;
+ tap_main_t *tm = &tap_main;
+ clib_error_t *err = 0;
+ int i;
+
+ /* *INDENT-OFF* */
+ vec_foreach_index (i, vif->vhost_fds) if (vif->vhost_fds[i] != -1)
+ close (vif->vhost_fds[i]);
+ vec_foreach_index (i, vif->rxq_vrings)
+ virtio_vring_free_rx (vm, vif, RX_QUEUE (i));
+ vec_foreach_index (i, vif->txq_vrings)
+ virtio_vring_free_tx (vm, vif, TX_QUEUE (i));
+ /* *INDENT-ON* */
+
+ _IOCTL (vif->tap_fd, TUNSETPERSIST, (void *) (uintptr_t) 0);
+ tap_log_dbg (vif, "TUNSETPERSIST: unset");
+error:
+ if (vif->tap_fd != -1)
+ close (vif->tap_fd);
+
+ vec_free (vif->vhost_fds);
+ vec_free (vif->rxq_vrings);
+ vec_free (vif->txq_vrings);
+ vec_free (vif->host_if_name);
+ vec_free (vif->net_ns);
+ vec_free (vif->host_bridge);
+ clib_error_free (vif->error);
+
+ tm->tap_ids = clib_bitmap_set (tm->tap_ids, vif->id, 0);
+ clib_memset (vif, 0, sizeof (*vif));
+ pool_put (mm->interfaces, vif);
+}
+
void
tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args)
{
+ vlib_thread_main_t *thm = vlib_get_thread_main ();
+ vlib_physmem_main_t *vpm = &vm->physmem_main;
vnet_main_t *vnm = vnet_get_main ();
virtio_main_t *vim = &virtio_main;
tap_main_t *tm = &tap_main;
vnet_hw_interface_t *hw;
int i;
int old_netns_fd = -1;
- struct ifreq ifr;
+ struct ifreq ifr = {.ifr_flags = IFF_TAP | IFF_NO_PI | IFF_VNET_HDR };
+ struct ifreq get_ifr = {.ifr_flags = 0 };
size_t hdrsz;
struct vhost_memory *vhost_mem = 0;
virtio_if_t *vif = 0;
- clib_file_t t = { 0 };
clib_error_t *err = 0;
- int fd = -1;
+ unsigned int tap_features;
+ int tfd, vfd, nfd = -1;
+ char *host_if_name = 0;
+ unsigned int offload = 0;
+ u16 num_q_pairs;
if (args->id != ~0)
{
return;
}
- clib_memset (&ifr, 0, sizeof (ifr));
- pool_get (vim->interfaces, vif);
+ pool_get_zero (vim->interfaces, vif);
+ vif->type = VIRTIO_IF_TYPE_TAP;
vif->dev_instance = vif - vim->interfaces;
- vif->tap_fd = -1;
vif->id = args->id;
+ vif->num_txqs = thm->n_vlib_mains;
+ vif->num_rxqs = args->num_rx_queues;
+ num_q_pairs = clib_max (vif->num_rxqs, vif->num_txqs);
+
+ if (args->tap_flags & TAP_FLAG_ATTACH)
+ {
+ if (args->host_if_name != NULL)
+ {
+ host_if_name = (char *) args->host_if_name;
+ clib_memcpy (ifr.ifr_name, host_if_name,
+ clib_min (IFNAMSIZ, strlen (host_if_name)));
+ }
+ else
+ {
+ args->rv = VNET_API_ERROR_NO_MATCHING_INTERFACE;
+ err = clib_error_return (0, "host_if_name is not provided");
+ goto error;
+ }
+ if (args->host_namespace)
+ {
+ old_netns_fd = open ("/proc/self/ns/net", O_RDONLY);
+ if ((nfd = open_netns_fd ((char *) args->host_namespace)) == -1)
+ {
+ args->rv = VNET_API_ERROR_SYSCALL_ERROR_2;
+ args->error = clib_error_return_unix (0, "open_netns_fd '%s'",
+ args->host_namespace);
+ goto error;
+ }
+ if (setns (nfd, CLONE_NEWNET) == -1)
+ {
+ args->rv = VNET_API_ERROR_SYSCALL_ERROR_3;
+ args->error = clib_error_return_unix (0, "setns '%s'",
+ args->host_namespace);
+ goto error;
+ }
+ }
+ }
+ if ((vif->tap_fd = tfd = open ("/dev/net/tun", O_RDWR | O_NONBLOCK)) < 0)
+ {
+ args->rv = VNET_API_ERROR_SYSCALL_ERROR_2;
+ args->error = clib_error_return_unix (0, "open '/dev/net/tun'");
+ goto error;
+ }
+ tap_log_dbg (vif, "open tap fd %d", tfd);
+
+ _IOCTL (tfd, TUNGETFEATURES, &tap_features);
+ tap_log_dbg (vif, "TUNGETFEATURES: features 0x%lx", tap_features);
+ if ((tap_features & IFF_VNET_HDR) == 0)
+ {
+ args->rv = VNET_API_ERROR_SYSCALL_ERROR_2;
+ args->error = clib_error_return (0, "vhost-net backend not available");
+ goto error;
+ }
+
+ if ((tap_features & IFF_MULTI_QUEUE) == 0)
+ {
+ if (args->num_rx_queues > 1)
+ {
+ args->rv = VNET_API_ERROR_SYSCALL_ERROR_2;
+ args->error = clib_error_return (0, "multiqueue not supported");
+ goto error;
+ }
+ vif->num_rxqs = vif->num_txqs = num_q_pairs = 1;
+ }
+ else
+ ifr.ifr_flags |= IFF_MULTI_QUEUE;
+
+ hdrsz = sizeof (struct virtio_net_hdr_v1);
+ if (args->tap_flags & TAP_FLAG_GSO)
+ {
+ offload = TUN_F_CSUM | TUN_F_TSO4 | TUN_F_TSO6;
+ vif->gso_enabled = 1;
+ }
+ else if (args->tap_flags & TAP_FLAG_CSUM_OFFLOAD)
+ {
+ offload = TUN_F_CSUM;
+ vif->csum_offload_enabled = 1;
+ }
+
+ _IOCTL (tfd, TUNSETIFF, (void *) &ifr);
+ tap_log_dbg (vif, "TUNSETIFF fd %d name %s flags 0x%x", tfd,
+ ifr.ifr_ifrn.ifrn_name, ifr.ifr_flags);
+
+ vif->ifindex = if_nametoindex (ifr.ifr_ifrn.ifrn_name);
+ tap_log_dbg (vif, "ifindex %d", vif->ifindex);
+
+ if (!args->host_if_name)
+ host_if_name = ifr.ifr_ifrn.ifrn_name;
+ else
+ host_if_name = (char *) args->host_if_name;
- if ((vif->fd = open ("/dev/vhost-net", O_RDWR | O_NONBLOCK)) < 0)
+ if (fcntl (tfd, F_SETFL, O_NONBLOCK) < 0)
{
- args->rv = VNET_API_ERROR_SYSCALL_ERROR_1;
- args->error = clib_error_return_unix (0, "open '/dev/vhost-net'");
+ err = clib_error_return_unix (0, "fcntl(tfd, F_SETFL, O_NONBLOCK)");
+ tap_log_err (vif, "set nonblocking: %U", format_clib_error, err);
goto error;
}
- _IOCTL (vif->fd, VHOST_GET_FEATURES, &vif->remote_features);
+ /*
+ * unset the persistence when attaching to existing
+ * interface
+ */
+ if (args->tap_flags & TAP_FLAG_ATTACH)
+ {
+ _IOCTL (tfd, TUNSETPERSIST, (void *) (uintptr_t) 0);
+ tap_log_dbg (vif, "TUNSETPERSIST: unset");
+ }
+
+ /* set the persistence */
+ if (args->tap_flags & TAP_FLAG_PERSIST)
+ {
+ _IOCTL (tfd, TUNSETPERSIST, (void *) (uintptr_t) 1);
+ tap_log_dbg (vif, "TUNSETPERSIST: set");
+
+ /* verify persistence is set, read the flags */
+ _IOCTL (tfd, TUNGETIFF, (void *) &get_ifr);
+ tap_log_dbg (vif, "TUNGETIFF: flags 0x%lx", get_ifr.ifr_flags);
+ if ((get_ifr.ifr_flags & IFF_PERSIST) == 0)
+ {
+ args->rv = VNET_API_ERROR_SYSCALL_ERROR_2;
+ args->error = clib_error_return (0, "persistence not supported");
+ goto error;
+ }
+ }
+
+ tap_log_dbg (vif, "TUNSETVNETHDRSZ: fd %d vnet_hdr_sz %u", tfd, hdrsz);
+ _IOCTL (tfd, TUNSETVNETHDRSZ, &hdrsz);
+
+ i = INT_MAX;
+ tap_log_dbg (vif, "TUNSETSNDBUF: fd %d sndbuf %d", tfd, i);
+ _IOCTL (tfd, TUNSETSNDBUF, &i);
+
+ tap_log_dbg (vif, "TUNSETOFFLOAD: fd %d offload 0x%lx", tfd, offload);
+ _IOCTL (tfd, TUNSETOFFLOAD, offload);
+
+ /* open vhost-net fd for each queue pair and set ownership */
+ for (i = 0; i < num_q_pairs; i++)
+ {
+ if ((vfd = open ("/dev/vhost-net", O_RDWR | O_NONBLOCK)) < 0)
+ {
+ args->rv = VNET_API_ERROR_SYSCALL_ERROR_1;
+ args->error = clib_error_return_unix (0, "open '/dev/vhost-net'");
+ goto error;
+ }
+ vec_add1 (vif->vhost_fds, vfd);
+ virtio_log_debug (vif, "open vhost-net fd %d qpair %u", vfd, i);
+ _IOCTL (vfd, VHOST_SET_OWNER, 0);
+ virtio_log_debug (vif, "VHOST_SET_OWNER: fd %u", vfd);
+ }
+
+ _IOCTL (vif->vhost_fds[0], VHOST_GET_FEATURES, &vif->remote_features);
+ virtio_log_debug (vif, "VHOST_GET_FEATURES: features 0x%lx",
+ vif->remote_features);
if ((vif->remote_features & VIRTIO_FEATURE (VIRTIO_NET_F_MRG_RXBUF)) == 0)
{
virtio_set_net_hdr_size (vif);
- _IOCTL (vif->fd, VHOST_SET_FEATURES, &vif->features);
-
- if ((vif->tap_fd = open ("/dev/net/tun", O_RDWR | O_NONBLOCK)) < 0)
- {
- args->rv = VNET_API_ERROR_SYSCALL_ERROR_2;
- args->error = clib_error_return_unix (0, "open '/dev/net/tun'");
- goto error;
- }
-
- ifr.ifr_flags = IFF_TAP | IFF_NO_PI | IFF_ONE_QUEUE | IFF_VNET_HDR;
- _IOCTL (vif->tap_fd, TUNSETIFF, (void *) &ifr);
- vif->ifindex = if_nametoindex (ifr.ifr_ifrn.ifrn_name);
-
- if (!args->host_if_name)
- args->host_if_name = (u8 *) ifr.ifr_ifrn.ifrn_name;
-
- unsigned int offload = 0;
- hdrsz = sizeof (struct virtio_net_hdr_v1);
- if (args->tap_flags & TAP_FLAG_GSO)
- {
- offload = TUN_F_CSUM | TUN_F_TSO4 | TUN_F_TSO6;
- vif->gso_enabled = 1;
- }
- else
- {
- vif->gso_enabled = 0;
- }
-
- _IOCTL (vif->tap_fd, TUNSETOFFLOAD, offload);
- _IOCTL (vif->tap_fd, TUNSETVNETHDRSZ, &hdrsz);
- _IOCTL (vif->fd, VHOST_SET_OWNER, 0);
-
- /* if namespace is specified, all further netlink messages should be excuted
- after we change our net namespace */
- if (args->host_namespace)
+ if (!(args->tap_flags & TAP_FLAG_ATTACH))
{
- old_netns_fd = open ("/proc/self/ns/net", O_RDONLY);
- if ((fd = open_netns_fd ((char *) args->host_namespace)) == -1)
- {
- args->rv = VNET_API_ERROR_SYSCALL_ERROR_2;
- args->error = clib_error_return_unix (0, "open_netns_fd '%s'",
- args->host_namespace);
- goto error;
- }
- args->error = vnet_netlink_set_link_netns (vif->ifindex, fd,
- (char *) args->host_if_name);
- if (args->error)
- {
- args->rv = VNET_API_ERROR_NETLINK_ERROR;
- goto error;
- }
- if (setns (fd, CLONE_NEWNET) == -1)
+ /* if namespace is specified, all further netlink messages should be executed
+ after we change our net namespace */
+ if (args->host_namespace)
{
- args->rv = VNET_API_ERROR_SYSCALL_ERROR_3;
- args->error = clib_error_return_unix (0, "setns '%s'",
- args->host_namespace);
- goto error;
- }
- if ((vif->ifindex = if_nametoindex ((char *) args->host_if_name)) == 0)
- {
- args->rv = VNET_API_ERROR_SYSCALL_ERROR_3;
- args->error = clib_error_return_unix (0, "if_nametoindex '%s'",
- args->host_if_name);
- goto error;
+ old_netns_fd = open ("/proc/self/ns/net", O_RDONLY);
+ if ((nfd = open_netns_fd ((char *) args->host_namespace)) == -1)
+ {
+ args->rv = VNET_API_ERROR_SYSCALL_ERROR_2;
+ args->error = clib_error_return_unix (0, "open_netns_fd '%s'",
+ args->host_namespace);
+ goto error;
+ }
+ args->error = vnet_netlink_set_link_netns (vif->ifindex, nfd,
+ host_if_name);
+ if (args->error)
+ {
+ args->rv = VNET_API_ERROR_NETLINK_ERROR;
+ goto error;
+ }
+ if (setns (nfd, CLONE_NEWNET) == -1)
+ {
+ args->rv = VNET_API_ERROR_SYSCALL_ERROR_3;
+ args->error = clib_error_return_unix (0, "setns '%s'",
+ args->host_namespace);
+ goto error;
+ }
+ if ((vif->ifindex = if_nametoindex (host_if_name)) == 0)
+ {
+ args->rv = VNET_API_ERROR_SYSCALL_ERROR_3;
+ args->error = clib_error_return_unix (0, "if_nametoindex '%s'",
+ host_if_name);
+ goto error;
+ }
}
- }
- else
- {
- if (args->host_if_name)
+ else if (host_if_name)
{
- args->error = vnet_netlink_set_link_name (vif->ifindex,
- (char *)
- args->host_if_name);
+ args->error =
+ vnet_netlink_set_link_name (vif->ifindex, host_if_name);
if (args->error)
{
args->rv = VNET_API_ERROR_NETLINK_ERROR;
}
}
- if (!ethernet_mac_address_is_zero (args->host_mac_addr))
+ if (ethernet_mac_address_is_zero (args->host_mac_addr.bytes))
+ ethernet_mac_address_generate (args->host_mac_addr.bytes);
+ args->error = vnet_netlink_set_link_addr (vif->ifindex,
+ args->host_mac_addr.bytes);
+ if (args->error)
{
- args->error = vnet_netlink_set_link_addr (vif->ifindex,
- args->host_mac_addr);
- if (args->error)
- {
- args->rv = VNET_API_ERROR_NETLINK_ERROR;
- goto error;
- }
+ args->rv = VNET_API_ERROR_NETLINK_ERROR;
+ goto error;
}
if (args->host_bridge)
}
}
-
if (args->host_ip4_prefix_len)
{
args->error = vnet_netlink_add_ip4_addr (vif->ifindex,
}
}
- /* switch back to old net namespace */
- if (args->host_namespace)
- {
- if (setns (old_netns_fd, CLONE_NEWNET) == -1)
- {
- args->rv = VNET_API_ERROR_SYSCALL_ERROR_2;
- args->error = clib_error_return_unix (0, "setns '%s'",
- args->host_namespace);
- goto error;
- }
- }
-
if (args->host_mtu_set)
{
args->error =
args->host_mtu_size = tm->host_mtu_size;
}
- /* Set vhost memory table */
+ /* switch back to old net namespace */
+ if (args->host_namespace)
+ {
+ if (setns (old_netns_fd, CLONE_NEWNET) == -1)
+ {
+ args->rv = VNET_API_ERROR_SYSCALL_ERROR_2;
+ args->error = clib_error_return_unix (0, "setns '%s'",
+ args->host_namespace);
+ goto error;
+ }
+ }
+
+ for (i = 0; i < num_q_pairs; i++)
+ {
+ if (i < vif->num_rxqs && (args->error =
+ virtio_vring_init (vm, vif, RX_QUEUE (i),
+ args->rx_ring_sz)))
+ {
+ args->rv = VNET_API_ERROR_INIT_FAILED;
+ goto error;
+ }
+
+ if (i < vif->num_txqs && (args->error =
+ virtio_vring_init (vm, vif, TX_QUEUE (i),
+ args->tx_ring_sz)))
+ {
+ args->rv = VNET_API_ERROR_INIT_FAILED;
+ goto error;
+ }
+ }
+
+ /* setup features and memtable */
i = sizeof (struct vhost_memory) + sizeof (struct vhost_memory_region);
vhost_mem = clib_mem_alloc (i);
clib_memset (vhost_mem, 0, i);
vhost_mem->nregions = 1;
- vhost_mem->regions[0].memory_size = (1ULL << 47) - 4096;
- _IOCTL (vif->fd, VHOST_SET_MEM_TABLE, vhost_mem);
+ vhost_mem->regions[0].memory_size = vpm->max_size;
+ vhost_mem->regions[0].guest_phys_addr = vpm->base_addr;
+ vhost_mem->regions[0].userspace_addr =
+ vhost_mem->regions[0].guest_phys_addr;
+
+ for (i = 0; i < vhost_mem->nregions; i++)
+ virtio_log_debug (vif, "memtable region %u memory_size 0x%lx "
+ "guest_phys_addr 0x%lx userspace_addr 0x%lx", i,
+ vhost_mem->regions[0].memory_size,
+ vhost_mem->regions[0].guest_phys_addr,
+ vhost_mem->regions[0].userspace_addr);
- if ((args->error =
- virtio_vring_init (vm, vif, RX_QUEUE (0), args->rx_ring_sz)))
+
+ for (i = 0; i < num_q_pairs; i++)
{
- args->rv = VNET_API_ERROR_INIT_FAILED;
- goto error;
+ int fd = vif->vhost_fds[i];
+ _IOCTL (fd, VHOST_SET_FEATURES, &vif->features);
+ virtio_log_debug (vif, "VHOST_SET_FEATURES: fd %u features 0x%lx",
+ fd, vif->features);
+ _IOCTL (fd, VHOST_SET_MEM_TABLE, vhost_mem);
+ virtio_log_debug (vif, "VHOST_SET_MEM_TABLE: fd %u", fd);
}
- vif->num_rxqs = 1;
- if ((args->error =
- virtio_vring_init (vm, vif, TX_QUEUE (0), args->tx_ring_sz)))
+ /* finish initializing queue pair */
+ for (i = 0; i < num_q_pairs * 2; i++)
{
- args->rv = VNET_API_ERROR_INIT_FAILED;
- goto error;
+ struct vhost_vring_addr addr = { 0 };
+ struct vhost_vring_state state = { 0 };
+ struct vhost_vring_file file = { 0 };
+ virtio_vring_t *vring;
+ u16 qp = i >> 1;
+ int fd = vif->vhost_fds[qp];
+
+ if (i & 1)
+ {
+ if (qp >= vif->num_txqs)
+ continue;
+ vring = vec_elt_at_index (vif->txq_vrings, qp);
+ }
+ else
+ {
+ if (qp >= vif->num_rxqs)
+ continue;
+ vring = vec_elt_at_index (vif->rxq_vrings, qp);
+ }
+
+ addr.index = state.index = file.index = vring->queue_id & 1;
+ state.num = vring->size;
+ virtio_log_debug (vif, "VHOST_SET_VRING_NUM fd %d index %u num %u", fd,
+ state.index, state.num);
+ _IOCTL (fd, VHOST_SET_VRING_NUM, &state);
+
+ addr.flags = 0;
+ addr.desc_user_addr = pointer_to_uword (vring->desc);
+ addr.avail_user_addr = pointer_to_uword (vring->avail);
+ addr.used_user_addr = pointer_to_uword (vring->used);
+
+ virtio_log_debug (vif, "VHOST_SET_VRING_ADDR fd %d index %u flags 0x%x "
+ "desc_user_addr 0x%lx avail_user_addr 0x%lx "
+ "used_user_addr 0x%lx", fd, addr.index,
+ addr.flags, addr.desc_user_addr, addr.avail_user_addr,
+ addr.used_user_addr);
+ _IOCTL (fd, VHOST_SET_VRING_ADDR, &addr);
+
+ file.fd = vring->call_fd;
+ virtio_log_debug (vif, "VHOST_SET_VRING_CALL fd %d index %u call_fd %d",
+ fd, file.index, file.fd);
+ _IOCTL (fd, VHOST_SET_VRING_CALL, &file);
+
+ file.fd = vring->kick_fd;
+ virtio_log_debug (vif, "VHOST_SET_VRING_KICK fd %d index %u kick_fd %d",
+ fd, file.index, file.fd);
+ _IOCTL (fd, VHOST_SET_VRING_KICK, &file);
+
+ file.fd = tfd;
+ virtio_log_debug (vif, "VHOST_NET_SET_BACKEND fd %d index %u tap_fd %d",
+ fd, file.index, file.fd);
+ _IOCTL (fd, VHOST_NET_SET_BACKEND, &file);
}
- vif->num_txqs = 1;
if (!args->mac_addr_set)
- ethernet_mac_address_generate (args->mac_addr);
+ ethernet_mac_address_generate (args->mac_addr.bytes);
- clib_memcpy (vif->mac_addr, args->mac_addr, 6);
+ clib_memcpy (vif->mac_addr, args->mac_addr.bytes, 6);
- vif->host_if_name = args->host_if_name;
- args->host_if_name = 0;
- vif->net_ns = args->host_namespace;
- args->host_namespace = 0;
- vif->host_bridge = args->host_bridge;
- args->host_bridge = 0;
+ vif->host_if_name = format (0, "%s%c", host_if_name, 0);
+ vif->net_ns = format (0, "%s%c", args->host_namespace, 0);
+ vif->host_bridge = format (0, "%s%c", args->host_bridge, 0);
vif->host_mtu_size = args->host_mtu_size;
- clib_memcpy (vif->host_mac_addr, args->host_mac_addr, 6);
+ clib_memcpy (vif->host_mac_addr, args->host_mac_addr.bytes, 6);
vif->host_ip4_prefix_len = args->host_ip4_prefix_len;
vif->host_ip6_prefix_len = args->host_ip6_prefix_len;
if (args->host_ip4_prefix_len)
if (args->host_ip6_prefix_len)
clib_memcpy (&vif->host_ip6_addr, &args->host_ip6_addr, 16);
- vif->type = VIRTIO_IF_TYPE_TAP;
args->error = ethernet_register_interface (vnm, virtio_device_class.index,
vif->dev_instance,
vif->mac_addr,
sw = vnet_get_hw_sw_interface (vnm, vif->hw_if_index);
vif->sw_if_index = sw->sw_if_index;
args->sw_if_index = vif->sw_if_index;
+ args->rv = 0;
hw = vnet_get_hw_interface (vnm, vif->hw_if_index);
hw->flags |= VNET_HW_INTERFACE_FLAG_SUPPORTS_INT_MODE;
if (args->tap_flags & TAP_FLAG_GSO)
{
- hw->flags |= VNET_HW_INTERFACE_FLAG_SUPPORTS_GSO;
- vnm->interface_main.gso_interface_count++;
+ hw->flags |= VNET_HW_INTERFACE_FLAG_SUPPORTS_GSO |
+ VNET_HW_INTERFACE_FLAG_SUPPORTS_TX_L4_CKSUM_OFFLOAD;
+ }
+ else if (args->tap_flags & TAP_FLAG_CSUM_OFFLOAD)
+ {
+ hw->flags |= VNET_HW_INTERFACE_FLAG_SUPPORTS_TX_L4_CKSUM_OFFLOAD;
}
vnet_hw_interface_set_input_node (vnm, vif->hw_if_index,
virtio_input_node.index);
- vnet_hw_interface_assign_rx_thread (vnm, vif->hw_if_index, 0, ~0);
- vnet_hw_interface_set_rx_mode (vnm, vif->hw_if_index, 0,
- VNET_HW_INTERFACE_RX_MODE_DEFAULT);
+
+ for (i = 0; i < vif->num_rxqs; i++)
+ {
+ vnet_hw_interface_assign_rx_thread (vnm, vif->hw_if_index, i, ~0);
+ vnet_hw_interface_set_rx_mode (vnm, vif->hw_if_index, i,
+ VNET_HW_INTERFACE_RX_MODE_DEFAULT);
+ }
+
vif->per_interface_next_index = ~0;
virtio_vring_set_numa_node (vm, vif, RX_QUEUE (0));
vif->flags |= VIRTIO_IF_FLAG_ADMIN_UP;
VNET_HW_INTERFACE_FLAG_LINK_UP);
vif->cxq_vring = NULL;
- t.read_function = call_tap_read_ready;
- t.error_function = call_tap_error_ready;
- t.file_descriptor = vif->tap_fd;
- t.private_data = vif->sw_if_index;
- t.description = format (0, "tap sw_if_index %u fd: %u",
- vif->sw_if_index, vif->tap_fd);
- vif->tap_file_index = clib_file_add (&file_main, &t);
-
goto done;
error:
args->error = err;
args->rv = VNET_API_ERROR_SYSCALL_ERROR_3;
}
- if (vif->tap_fd != -1)
- close (vif->tap_fd);
- if (vif->fd != -1)
- close (vif->fd);
- vec_foreach_index (i, vif->rxq_vrings) virtio_vring_free_rx (vm, vif,
- RX_QUEUE (i));
- vec_foreach_index (i, vif->txq_vrings) virtio_vring_free_tx (vm, vif,
- TX_QUEUE (i));
- vec_free (vif->rxq_vrings);
- vec_free (vif->txq_vrings);
- clib_memset (vif, 0, sizeof (virtio_if_t));
- pool_put (vim->interfaces, vif);
+ tap_log_err (vif, "%U", format_clib_error, args->error);
+ tap_free (vm, vif);
done:
if (vhost_mem)
clib_mem_free (vhost_mem);
if (old_netns_fd != -1)
close (old_netns_fd);
- if (fd != -1)
- close (fd);
+ if (nfd != -1)
+ close (nfd);
}
int
{
vnet_main_t *vnm = vnet_get_main ();
virtio_main_t *mm = &virtio_main;
- tap_main_t *tm = &tap_main;
int i;
virtio_if_t *vif;
vnet_hw_interface_t *hw;
- hw = vnet_get_sup_hw_interface (vnm, sw_if_index);
+ hw = vnet_get_sup_hw_interface_api_visible_or_null (vnm, sw_if_index);
if (hw == NULL || virtio_device_class.index != hw->dev_class_index)
return VNET_API_ERROR_INVALID_SW_IF_INDEX;
if (vif->type != VIRTIO_IF_TYPE_TAP)
return VNET_API_ERROR_INVALID_INTERFACE;
- /* decrement if this was a GSO interface */
- if (hw->flags & VNET_HW_INTERFACE_FLAG_SUPPORTS_GSO)
- vnm->interface_main.gso_interface_count--;
-
- clib_file_del_by_index (&file_main, vif->tap_file_index);
/* bring down the interface */
vnet_hw_interface_set_flags (vnm, vif->hw_if_index, 0);
vnet_sw_interface_set_flags (vnm, vif->sw_if_index, 0);
- vnet_hw_interface_unassign_rx_thread (vnm, vif->hw_if_index, RX_QUEUE (0));
+ for (i = 0; i < vif->num_rxqs; i++)
+ vnet_hw_interface_unassign_rx_thread (vnm, vif->hw_if_index, i);
ethernet_delete_interface (vnm, vif->hw_if_index);
vif->hw_if_index = ~0;
- if (vif->tap_fd != -1)
- close (vif->tap_fd);
- if (vif->fd != -1)
- close (vif->fd);
+ tap_free (vm, vif);
- vec_foreach_index (i, vif->rxq_vrings) virtio_vring_free_rx (vm, vif,
- RX_QUEUE (i));
- vec_foreach_index (i, vif->txq_vrings) virtio_vring_free_tx (vm, vif,
- TX_QUEUE (i));
- vec_free (vif->rxq_vrings);
- vec_free (vif->txq_vrings);
+ return 0;
+}
- tm->tap_ids = clib_bitmap_set (tm->tap_ids, vif->id, 0);
- clib_memset (vif, 0, sizeof (*vif));
- pool_put (mm->interfaces, vif);
+int
+tap_csum_offload_enable_disable (vlib_main_t * vm, u32 sw_if_index,
+ int enable_disable)
+{
+ vnet_main_t *vnm = vnet_get_main ();
+ virtio_main_t *mm = &virtio_main;
+ virtio_if_t *vif;
+ vnet_hw_interface_t *hw;
+ clib_error_t *err = 0;
+
+ hw = vnet_get_sup_hw_interface_api_visible_or_null (vnm, sw_if_index);
+
+ if (hw == NULL || virtio_device_class.index != hw->dev_class_index)
+ return VNET_API_ERROR_INVALID_SW_IF_INDEX;
+
+ vif = pool_elt_at_index (mm->interfaces, hw->dev_instance);
+
+ const unsigned int csum_offload_on = TUN_F_CSUM;
+ const unsigned int csum_offload_off = 0;
+ unsigned int offload = enable_disable ? csum_offload_on : csum_offload_off;
+ _IOCTL (vif->tap_fd, TUNSETOFFLOAD, offload);
+ vif->gso_enabled = 0;
+ vif->csum_offload_enabled = enable_disable ? 1 : 0;
+
+ if ((hw->flags & VNET_HW_INTERFACE_FLAG_SUPPORTS_GSO) != 0)
+ {
+ hw->flags &= ~VNET_HW_INTERFACE_FLAG_SUPPORTS_GSO;
+ }
+
+ if (enable_disable)
+ {
+ if ((hw->flags & VNET_HW_INTERFACE_FLAG_SUPPORTS_TX_L4_CKSUM_OFFLOAD) ==
+ 0)
+ {
+ hw->flags |= VNET_HW_INTERFACE_FLAG_SUPPORTS_TX_L4_CKSUM_OFFLOAD;
+ }
+ }
+ else
+ {
+ if ((hw->flags & VNET_HW_INTERFACE_FLAG_SUPPORTS_TX_L4_CKSUM_OFFLOAD) !=
+ 0)
+ {
+ hw->flags &= ~VNET_HW_INTERFACE_FLAG_SUPPORTS_TX_L4_CKSUM_OFFLOAD;
+ }
+ }
+error:
+ if (err)
+ {
+ clib_warning ("Error %s checksum offload on sw_if_index %d",
+ enable_disable ? "enabling" : "disabling", sw_if_index);
+ return VNET_API_ERROR_SYSCALL_ERROR_3;
+ }
return 0;
}
vnet_main_t *vnm = vnet_get_main ();
virtio_main_t *mm = &virtio_main;
virtio_if_t *vif;
- vnet_hw_interface_t *hw = vnet_get_sup_hw_interface (vnm, sw_if_index);
+ vnet_hw_interface_t *hw;
clib_error_t *err = 0;
+ hw = vnet_get_sup_hw_interface_api_visible_or_null (vnm, sw_if_index);
+
if (hw == NULL || virtio_device_class.index != hw->dev_class_index)
return VNET_API_ERROR_INVALID_SW_IF_INDEX;
unsigned int offload = enable_disable ? gso_on : gso_off;
_IOCTL (vif->tap_fd, TUNSETOFFLOAD, offload);
vif->gso_enabled = enable_disable ? 1 : 0;
+ vif->csum_offload_enabled = 0;
if (enable_disable)
{
if ((hw->flags & VNET_HW_INTERFACE_FLAG_SUPPORTS_GSO) == 0)
{
- vnm->interface_main.gso_interface_count++;
- hw->flags |= VNET_HW_INTERFACE_FLAG_SUPPORTS_GSO;
+ hw->flags |= VNET_HW_INTERFACE_FLAG_SUPPORTS_GSO |
+ VNET_HW_INTERFACE_FLAG_SUPPORTS_TX_L4_CKSUM_OFFLOAD;
}
}
else
{
if ((hw->flags & VNET_HW_INTERFACE_FLAG_SUPPORTS_GSO) != 0)
{
- vnm->interface_main.gso_interface_count--;
- hw->flags &= ~VNET_HW_INTERFACE_FLAG_SUPPORTS_GSO;
+ hw->flags &= ~(VNET_HW_INTERFACE_FLAG_SUPPORTS_GSO |
+ VNET_HW_INTERFACE_FLAG_SUPPORTS_TX_L4_CKSUM_OFFLOAD);
}
}
tapid->rx_ring_sz = vring->size;
vring = vec_elt_at_index (vif->txq_vrings, TX_QUEUE_ACCESS(0));
tapid->tx_ring_sz = vring->size;
- clib_memcpy(tapid->host_mac_addr, vif->host_mac_addr, 6);
+ clib_memcpy(&tapid->host_mac_addr, vif->host_mac_addr, 6);
if (vif->host_if_name)
{
clib_memcpy(tapid->host_if_name, vif->host_if_name,
strlen ((const char *) vif->host_bridge)));
}
if (vif->host_ip4_prefix_len)
- clib_memcpy(tapid->host_ip4_addr, &vif->host_ip4_addr, 4);
+ clib_memcpy(tapid->host_ip4_addr.as_u8, &vif->host_ip4_addr, 4);
tapid->host_ip4_prefix_len = vif->host_ip4_prefix_len;
if (vif->host_ip6_prefix_len)
- clib_memcpy(tapid->host_ip6_addr, &vif->host_ip6_addr, 16);
+ clib_memcpy(tapid->host_ip6_addr.as_u8, &vif->host_ip6_addr, 16);
tapid->host_ip6_prefix_len = vif->host_ip6_prefix_len;
tapid->host_mtu_size = vif->host_mtu_size;
);
Code Review / vpp.git / blobdiff