git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove useless constructor headers
[dpdk.git]
/
drivers
/
net
/
vhost
/
rte_eth_vhost.c
diff --git
a/drivers/net/vhost/rte_eth_vhost.c
b/drivers/net/vhost/rte_eth_vhost.c
index
2eb06f1
..
47b3345
100644
(file)
--- a/
drivers/net/vhost/rte_eth_vhost.c
+++ b/
drivers/net/vhost/rte_eth_vhost.c
@@
-18,6
+18,11
@@
#include "rte_eth_vhost.h"
#include "rte_eth_vhost.h"
+static int vhost_logtype;
+
+#define VHOST_LOG(level, ...) \
+ rte_log(RTE_LOG_ ## level, vhost_logtype, __VA_ARGS__)
+
enum {VIRTIO_RXQ, VIRTIO_TXQ, VIRTIO_QNUM};
#define ETH_VHOST_IFACE_ARG "iface"
enum {VIRTIO_RXQ, VIRTIO_TXQ, VIRTIO_QNUM};
#define ETH_VHOST_IFACE_ARG "iface"
@@
-89,7
+94,7
@@
struct pmd_internal {
char *dev_name;
char *iface_name;
uint16_t max_queues;
char *dev_name;
char *iface_name;
uint16_t max_queues;
-
uint16_
t vid;
+
in
t vid;
rte_atomic32_t started;
uint8_t vlan_strip;
};
rte_atomic32_t started;
uint8_t vlan_strip;
};
@@
-395,7
+400,6
@@
eth_vhost_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
for (i = 0; likely(i < nb_rx); i++) {
bufs[i]->port = r->port;
for (i = 0; likely(i < nb_rx); i++) {
bufs[i]->port = r->port;
- bufs[i]->ol_flags = 0;
bufs[i]->vlan_tci = 0;
if (r->internal->vlan_strip)
bufs[i]->vlan_tci = 0;
if (r->internal->vlan_strip)
@@
-487,12
+491,7
@@
eth_dev_configure(struct rte_eth_dev *dev __rte_unused)
struct pmd_internal *internal = dev->data->dev_private;
const struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode;
struct pmd_internal *internal = dev->data->dev_private;
const struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode;
- internal->vlan_strip = rxmode->hw_vlan_strip;
-
- if (rxmode->hw_vlan_filter)
- RTE_LOG(WARNING, PMD,
- "vhost(%s): vlan filtering not available\n",
- internal->dev_name);
+ internal->vlan_strip = !!(rxmode->offloads & DEV_RX_OFFLOAD_VLAN_STRIP);
return 0;
}
return 0;
}
@@
-534,16
+533,16
@@
eth_rxq_intr_enable(struct rte_eth_dev *dev, uint16_t qid)
vq = dev->data->rx_queues[qid];
if (!vq) {
vq = dev->data->rx_queues[qid];
if (!vq) {
-
RTE_LOG(ERR, PMD
, "rxq%d is not setup yet\n", qid);
+
VHOST_LOG(ERR
, "rxq%d is not setup yet\n", qid);
return -1;
}
ret = rte_vhost_get_vhost_vring(vq->vid, (qid << 1) + 1, &vring);
if (ret < 0) {
return -1;
}
ret = rte_vhost_get_vhost_vring(vq->vid, (qid << 1) + 1, &vring);
if (ret < 0) {
-
RTE_LOG(ERR, PMD
, "Failed to get rxq%d's vring\n", qid);
+
VHOST_LOG(ERR
, "Failed to get rxq%d's vring\n", qid);
return ret;
}
return ret;
}
-
RTE_LOG(INFO, PMD
, "Enable interrupt for rxq%d\n", qid);
+
VHOST_LOG(INFO
, "Enable interrupt for rxq%d\n", qid);
rte_vhost_enable_guest_notification(vq->vid, (qid << 1) + 1, 1);
rte_wmb();
rte_vhost_enable_guest_notification(vq->vid, (qid << 1) + 1, 1);
rte_wmb();
@@
-559,16
+558,16
@@
eth_rxq_intr_disable(struct rte_eth_dev *dev, uint16_t qid)
vq = dev->data->rx_queues[qid];
if (!vq) {
vq = dev->data->rx_queues[qid];
if (!vq) {
-
RTE_LOG(ERR, PMD
, "rxq%d is not setup yet\n", qid);
+
VHOST_LOG(ERR
, "rxq%d is not setup yet\n", qid);
return -1;
}
ret = rte_vhost_get_vhost_vring(vq->vid, (qid << 1) + 1, &vring);
if (ret < 0) {
return -1;
}
ret = rte_vhost_get_vhost_vring(vq->vid, (qid << 1) + 1, &vring);
if (ret < 0) {
-
RTE_LOG(ERR, PMD
, "Failed to get rxq%d's vring", qid);
+
VHOST_LOG(ERR
, "Failed to get rxq%d's vring", qid);
return ret;
}
return ret;
}
-
RTE_LOG(INFO, PMD
, "Disable interrupt for rxq%d\n", qid);
+
VHOST_LOG(INFO
, "Disable interrupt for rxq%d\n", qid);
rte_vhost_enable_guest_notification(vq->vid, (qid << 1) + 1, 0);
rte_wmb();
rte_vhost_enable_guest_notification(vq->vid, (qid << 1) + 1, 0);
rte_wmb();
@@
-605,7
+604,7
@@
eth_vhost_install_intr(struct rte_eth_dev *dev)
dev->intr_handle = malloc(sizeof(*dev->intr_handle));
if (!dev->intr_handle) {
dev->intr_handle = malloc(sizeof(*dev->intr_handle));
if (!dev->intr_handle) {
-
RTE_LOG(ERR, PMD
, "Fail to allocate intr_handle\n");
+
VHOST_LOG(ERR
, "Fail to allocate intr_handle\n");
return -ENOMEM;
}
memset(dev->intr_handle, 0, sizeof(*dev->intr_handle));
return -ENOMEM;
}
memset(dev->intr_handle, 0, sizeof(*dev->intr_handle));
@@
-616,36
+615,36
@@
eth_vhost_install_intr(struct rte_eth_dev *dev)
malloc(nb_rxq * sizeof(dev->intr_handle->intr_vec[0]));
if (!dev->intr_handle->intr_vec) {
malloc(nb_rxq * sizeof(dev->intr_handle->intr_vec[0]));
if (!dev->intr_handle->intr_vec) {
-
RTE_LOG(ERR, PMD
,
+
VHOST_LOG(ERR
,
"Failed to allocate memory for interrupt vector\n");
free(dev->intr_handle);
return -ENOMEM;
}
"Failed to allocate memory for interrupt vector\n");
free(dev->intr_handle);
return -ENOMEM;
}
-
RTE_LOG(INFO, PMD
, "Prepare intr vec\n");
+
VHOST_LOG(INFO
, "Prepare intr vec\n");
for (i = 0; i < nb_rxq; i++) {
vq = dev->data->rx_queues[i];
if (!vq) {
for (i = 0; i < nb_rxq; i++) {
vq = dev->data->rx_queues[i];
if (!vq) {
-
RTE_LOG(INFO, PMD
, "rxq-%d not setup yet, skip!\n", i);
+
VHOST_LOG(INFO
, "rxq-%d not setup yet, skip!\n", i);
continue;
}
ret = rte_vhost_get_vhost_vring(vq->vid, (i << 1) + 1, &vring);
if (ret < 0) {
continue;
}
ret = rte_vhost_get_vhost_vring(vq->vid, (i << 1) + 1, &vring);
if (ret < 0) {
-
RTE_LOG(INFO, PMD
,
+
VHOST_LOG(INFO
,
"Failed to get rxq-%d's vring, skip!\n", i);
continue;
}
if (vring.kickfd < 0) {
"Failed to get rxq-%d's vring, skip!\n", i);
continue;
}
if (vring.kickfd < 0) {
-
RTE_LOG(INFO, PMD
,
+
VHOST_LOG(INFO
,
"rxq-%d's kickfd is invalid, skip!\n", i);
continue;
}
dev->intr_handle->intr_vec[i] = RTE_INTR_VEC_RXTX_OFFSET + i;
dev->intr_handle->efds[i] = vring.kickfd;
count++;
"rxq-%d's kickfd is invalid, skip!\n", i);
continue;
}
dev->intr_handle->intr_vec[i] = RTE_INTR_VEC_RXTX_OFFSET + i;
dev->intr_handle->efds[i] = vring.kickfd;
count++;
-
RTE_LOG(INFO, PMD
, "Installed intr vec for rxq-%d\n", i);
+
VHOST_LOG(INFO
, "Installed intr vec for rxq-%d\n", i);
}
dev->intr_handle->nb_efd = count;
}
dev->intr_handle->nb_efd = count;
@@
-730,7
+729,7
@@
new_device(int vid)
rte_vhost_get_ifname(vid, ifname, sizeof(ifname));
list = find_internal_resource(ifname);
if (list == NULL) {
rte_vhost_get_ifname(vid, ifname, sizeof(ifname));
list = find_internal_resource(ifname);
if (list == NULL) {
-
RTE_LOG(INFO, PMD
, "Invalid device name: %s\n", ifname);
+
VHOST_LOG(INFO
, "Invalid device name: %s\n", ifname);
return -1;
}
return -1;
}
@@
-750,13
+749,13
@@
new_device(int vid)
if (dev_conf->intr_conf.rxq) {
if (eth_vhost_install_intr(eth_dev) < 0) {
if (dev_conf->intr_conf.rxq) {
if (eth_vhost_install_intr(eth_dev) < 0) {
-
RTE_LOG(INFO, PMD
,
+
VHOST_LOG(INFO
,
"Failed to install interrupt handler.");
return -1;
}
}
} else {
"Failed to install interrupt handler.");
return -1;
}
}
} else {
-
RTE_LOG(INFO, PMD
, "RX/TX queues not exist yet\n");
+
VHOST_LOG(INFO
, "RX/TX queues not exist yet\n");
}
for (i = 0; i < rte_vhost_get_vring_num(vid); i++)
}
for (i = 0; i < rte_vhost_get_vring_num(vid); i++)
@@
-769,7
+768,7
@@
new_device(int vid)
rte_atomic32_set(&internal->dev_attached, 1);
update_queuing_status(eth_dev);
rte_atomic32_set(&internal->dev_attached, 1);
update_queuing_status(eth_dev);
-
RTE_LOG(INFO, PMD
, "Vhost device %d created\n", vid);
+
VHOST_LOG(INFO
, "Vhost device %d created\n", vid);
_rte_eth_dev_callback_process(eth_dev, RTE_ETH_EVENT_INTR_LSC, NULL);
_rte_eth_dev_callback_process(eth_dev, RTE_ETH_EVENT_INTR_LSC, NULL);
@@
-790,7
+789,7
@@
destroy_device(int vid)
rte_vhost_get_ifname(vid, ifname, sizeof(ifname));
list = find_internal_resource(ifname);
if (list == NULL) {
rte_vhost_get_ifname(vid, ifname, sizeof(ifname));
list = find_internal_resource(ifname);
if (list == NULL) {
-
RTE_LOG(ERR, PMD
, "Invalid interface name: %s\n", ifname);
+
VHOST_LOG(ERR
, "Invalid interface name: %s\n", ifname);
return;
}
eth_dev = list->eth_dev;
return;
}
eth_dev = list->eth_dev;
@@
-825,7
+824,7
@@
destroy_device(int vid)
state->max_vring = 0;
rte_spinlock_unlock(&state->lock);
state->max_vring = 0;
rte_spinlock_unlock(&state->lock);
-
RTE_LOG(INFO, PMD
, "Vhost device %d destroyed\n", vid);
+
VHOST_LOG(INFO
, "Vhost device %d destroyed\n", vid);
eth_vhost_uninstall_intr(eth_dev);
_rte_eth_dev_callback_process(eth_dev, RTE_ETH_EVENT_INTR_LSC, NULL);
eth_vhost_uninstall_intr(eth_dev);
_rte_eth_dev_callback_process(eth_dev, RTE_ETH_EVENT_INTR_LSC, NULL);
@@
-842,7
+841,7
@@
vring_state_changed(int vid, uint16_t vring, int enable)
rte_vhost_get_ifname(vid, ifname, sizeof(ifname));
list = find_internal_resource(ifname);
if (list == NULL) {
rte_vhost_get_ifname(vid, ifname, sizeof(ifname));
list = find_internal_resource(ifname);
if (list == NULL) {
-
RTE_LOG(ERR, PMD
, "Invalid interface name: %s\n", ifname);
+
VHOST_LOG(ERR
, "Invalid interface name: %s\n", ifname);
return -1;
}
return -1;
}
@@
-854,7
+853,7
@@
vring_state_changed(int vid, uint16_t vring, int enable)
state->max_vring = RTE_MAX(vring, state->max_vring);
rte_spinlock_unlock(&state->lock);
state->max_vring = RTE_MAX(vring, state->max_vring);
rte_spinlock_unlock(&state->lock);
-
RTE_LOG(INFO, PMD
, "vring%u is %s\n",
+
VHOST_LOG(INFO
, "vring%u is %s\n",
vring, enable ? "enabled" : "disabled");
_rte_eth_dev_callback_process(eth_dev, RTE_ETH_EVENT_QUEUE_STATE, NULL);
vring, enable ? "enabled" : "disabled");
_rte_eth_dev_callback_process(eth_dev, RTE_ETH_EVENT_QUEUE_STATE, NULL);
@@
-877,13
+876,13
@@
rte_eth_vhost_get_queue_event(uint16_t port_id,
int idx;
if (port_id >= RTE_MAX_ETHPORTS) {
int idx;
if (port_id >= RTE_MAX_ETHPORTS) {
-
RTE_LOG(ERR, PMD
, "Invalid port id\n");
+
VHOST_LOG(ERR
, "Invalid port id\n");
return -1;
}
state = vring_states[port_id];
if (!state) {
return -1;
}
state = vring_states[port_id];
if (!state) {
-
RTE_LOG(ERR, PMD
, "Unused port\n");
+
VHOST_LOG(ERR
, "Unused port\n");
return -1;
}
return -1;
}
@@
-945,7
+944,7
@@
eth_dev_start(struct rte_eth_dev *eth_dev)
if (rte_atomic32_read(&internal->dev_attached) == 1) {
if (dev_conf->intr_conf.rxq) {
if (eth_vhost_install_intr(eth_dev) < 0) {
if (rte_atomic32_read(&internal->dev_attached) == 1) {
if (dev_conf->intr_conf.rxq) {
if (eth_vhost_install_intr(eth_dev) < 0) {
-
RTE_LOG(INFO, PMD
,
+
VHOST_LOG(INFO
,
"Failed to install interrupt handler.");
return -1;
}
"Failed to install interrupt handler.");
return -1;
}
@@
-1019,7
+1018,7
@@
eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
vq = rte_zmalloc_socket(NULL, sizeof(struct vhost_queue),
RTE_CACHE_LINE_SIZE, socket_id);
if (vq == NULL) {
vq = rte_zmalloc_socket(NULL, sizeof(struct vhost_queue),
RTE_CACHE_LINE_SIZE, socket_id);
if (vq == NULL) {
-
RTE_LOG(ERR, PMD
, "Failed to allocate memory for rx queue\n");
+
VHOST_LOG(ERR
, "Failed to allocate memory for rx queue\n");
return -ENOMEM;
}
return -ENOMEM;
}
@@
-1041,7
+1040,7
@@
eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
vq = rte_zmalloc_socket(NULL, sizeof(struct vhost_queue),
RTE_CACHE_LINE_SIZE, socket_id);
if (vq == NULL) {
vq = rte_zmalloc_socket(NULL, sizeof(struct vhost_queue),
RTE_CACHE_LINE_SIZE, socket_id);
if (vq == NULL) {
-
RTE_LOG(ERR, PMD
, "Failed to allocate memory for tx queue\n");
+
VHOST_LOG(ERR
, "Failed to allocate memory for tx queue\n");
return -ENOMEM;
}
return -ENOMEM;
}
@@
-1059,7
+1058,7
@@
eth_dev_info(struct rte_eth_dev *dev,
internal = dev->data->dev_private;
if (internal == NULL) {
internal = dev->data->dev_private;
if (internal == NULL) {
-
RTE_LOG(ERR, PMD
, "Invalid device specified\n");
+
VHOST_LOG(ERR
, "Invalid device specified\n");
return;
}
return;
}
@@
-1068,6
+1067,11
@@
eth_dev_info(struct rte_eth_dev *dev,
dev_info->max_rx_queues = internal->max_queues;
dev_info->max_tx_queues = internal->max_queues;
dev_info->min_rx_bufsize = 0;
dev_info->max_rx_queues = internal->max_queues;
dev_info->max_tx_queues = internal->max_queues;
dev_info->min_rx_bufsize = 0;
+
+ dev_info->tx_offload_capa = DEV_TX_OFFLOAD_MULTI_SEGS |
+ DEV_TX_OFFLOAD_VLAN_INSERT;
+ dev_info->rx_offload_capa = DEV_RX_OFFLOAD_VLAN_STRIP |
+ DEV_RX_OFFLOAD_CRC_STRIP;
}
static int
}
static int
@@
-1206,7
+1210,7
@@
eth_dev_vhost_create(struct rte_vdev_device *dev, char *iface_name,
struct rte_vhost_vring_state *vring_state = NULL;
struct internal_list *list = NULL;
struct rte_vhost_vring_state *vring_state = NULL;
struct internal_list *list = NULL;
-
RTE_LOG(INFO, PMD
, "Creating VHOST-USER backend on numa socket %u\n",
+
VHOST_LOG(INFO
, "Creating VHOST-USER backend on numa socket %u\n",
numa_node);
list = rte_zmalloc_socket(name, sizeof(*list), 0, numa_node);
numa_node);
list = rte_zmalloc_socket(name, sizeof(*list), 0, numa_node);
@@
-1254,6
+1258,7
@@
eth_dev_vhost_create(struct rte_vdev_device *dev, char *iface_name,
data->nb_rx_queues = queues;
data->nb_tx_queues = queues;
internal->max_queues = queues;
data->nb_rx_queues = queues;
data->nb_tx_queues = queues;
internal->max_queues = queues;
+ internal->vid = -1;
data->dev_link = pmd_link;
data->mac_addrs = eth_addr;
data->dev_flags = RTE_ETH_DEV_INTR_LSC;
data->dev_link = pmd_link;
data->mac_addrs = eth_addr;
data->dev_flags = RTE_ETH_DEV_INTR_LSC;
@@
-1268,16
+1273,17
@@
eth_dev_vhost_create(struct rte_vdev_device *dev, char *iface_name,
goto error;
if (rte_vhost_driver_callback_register(iface_name, &vhost_ops) < 0) {
goto error;
if (rte_vhost_driver_callback_register(iface_name, &vhost_ops) < 0) {
-
RTE_LOG(ERR, PMD
, "Can't register callbacks\n");
+
VHOST_LOG(ERR
, "Can't register callbacks\n");
goto error;
}
if (rte_vhost_driver_start(iface_name) < 0) {
goto error;
}
if (rte_vhost_driver_start(iface_name) < 0) {
-
RTE_LOG(ERR, PMD
, "Failed to start driver for %s\n",
+
VHOST_LOG(ERR
, "Failed to start driver for %s\n",
iface_name);
goto error;
}
iface_name);
goto error;
}
+ rte_eth_dev_probing_finish(eth_dev);
return data->port_id;
error:
return data->port_id;
error:
@@
-1337,17
+1343,18
@@
rte_pmd_vhost_probe(struct rte_vdev_device *dev)
struct rte_eth_dev *eth_dev;
const char *name = rte_vdev_device_name(dev);
struct rte_eth_dev *eth_dev;
const char *name = rte_vdev_device_name(dev);
-
RTE_LOG(INFO, PMD
, "Initializing pmd_vhost for %s\n", name);
+
VHOST_LOG(INFO
, "Initializing pmd_vhost for %s\n", name);
if (rte_eal_process_type() == RTE_PROC_SECONDARY &&
strlen(rte_vdev_device_args(dev)) == 0) {
eth_dev = rte_eth_dev_attach_secondary(name);
if (!eth_dev) {
if (rte_eal_process_type() == RTE_PROC_SECONDARY &&
strlen(rte_vdev_device_args(dev)) == 0) {
eth_dev = rte_eth_dev_attach_secondary(name);
if (!eth_dev) {
-
RTE_LOG(ERR, PMD
, "Failed to probe %s\n", name);
+
VHOST_LOG(ERR
, "Failed to probe %s\n", name);
return -1;
}
/* TODO: request info from primary to set up Rx and Tx */
eth_dev->dev_ops = &ops;
return -1;
}
/* TODO: request info from primary to set up Rx and Tx */
eth_dev->dev_ops = &ops;
+ rte_eth_dev_probing_finish(eth_dev);
return 0;
}
return 0;
}
@@
-1422,7
+1429,7
@@
rte_pmd_vhost_remove(struct rte_vdev_device *dev)
struct rte_eth_dev *eth_dev = NULL;
name = rte_vdev_device_name(dev);
struct rte_eth_dev *eth_dev = NULL;
name = rte_vdev_device_name(dev);
-
RTE_LOG(INFO, PMD
, "Un-Initializing pmd_vhost for %s\n", name);
+
VHOST_LOG(INFO
, "Un-Initializing pmd_vhost for %s\n", name);
/* find an ethdev entry */
eth_dev = rte_eth_dev_allocated(name);
/* find an ethdev entry */
eth_dev = rte_eth_dev_allocated(name);
@@
-1449,3
+1456,10
@@
RTE_PMD_REGISTER_ALIAS(net_vhost, eth_vhost);
RTE_PMD_REGISTER_PARAM_STRING(net_vhost,
"iface=<ifc> "
"queues=<int>");
RTE_PMD_REGISTER_PARAM_STRING(net_vhost,
"iface=<ifc> "
"queues=<int>");
+
+RTE_INIT(vhost_init_log)
+{
+ vhost_logtype = rte_log_register("pmd.net.vhost");
+ if (vhost_logtype >= 0)
+ rte_log_set_level(vhost_logtype, RTE_LOG_NOTICE);
+}