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
net/dpaa2: enable error queues optionally
[dpdk.git]
/
drivers
/
net
/
memif
/
memif_socket.c
diff --git
a/drivers/net/memif/memif_socket.c
b/drivers/net/memif/memif_socket.c
index
7a26e30
..
5b37373
100644
(file)
--- a/
drivers/net/memif/memif_socket.c
+++ b/
drivers/net/memif/memif_socket.c
@@
-13,8
+13,8
@@
#include <rte_version.h>
#include <rte_mbuf.h>
#include <rte_ether.h>
#include <rte_version.h>
#include <rte_mbuf.h>
#include <rte_ether.h>
-#include <
rte_
ethdev_driver.h>
-#include <
rte_
ethdev_vdev.h>
+#include <ethdev_driver.h>
+#include <ethdev_vdev.h>
#include <rte_malloc.h>
#include <rte_kvargs.h>
#include <rte_bus_vdev.h>
#include <rte_malloc.h>
#include <rte_kvargs.h>
#include <rte_bus_vdev.h>
@@
-143,8
+143,8
@@
memif_msg_enq_hello(struct memif_control_channel *cc)
e->msg.type = MEMIF_MSG_TYPE_HELLO;
h->min_version = MEMIF_VERSION;
h->max_version = MEMIF_VERSION;
e->msg.type = MEMIF_MSG_TYPE_HELLO;
h->min_version = MEMIF_VERSION;
h->max_version = MEMIF_VERSION;
- h->max_
s2m
_ring = ETH_MEMIF_MAX_NUM_Q_PAIRS;
- h->max_
m2s
_ring = ETH_MEMIF_MAX_NUM_Q_PAIRS;
+ h->max_
c2s
_ring = ETH_MEMIF_MAX_NUM_Q_PAIRS;
+ h->max_
s2c
_ring = ETH_MEMIF_MAX_NUM_Q_PAIRS;
h->max_region = ETH_MEMIF_MAX_REGION_NUM - 1;
h->max_log2_ring_size = ETH_MEMIF_MAX_LOG2_RING_SIZE;
h->max_region = ETH_MEMIF_MAX_REGION_NUM - 1;
h->max_log2_ring_size = ETH_MEMIF_MAX_LOG2_RING_SIZE;
@@
-165,10
+165,10
@@
memif_msg_receive_hello(struct rte_eth_dev *dev, memif_msg_t *msg)
}
/* Set parameters for active connection */
}
/* Set parameters for active connection */
- pmd->run.num_
s2m_rings = RTE_MIN(h->max_s2m
_ring + 1,
- pmd->cfg.num_
s2m
_rings);
- pmd->run.num_
m2s_rings = RTE_MIN(h->max_m2s
_ring + 1,
- pmd->cfg.num_
m2s
_rings);
+ pmd->run.num_
c2s_rings = RTE_MIN(h->max_c2s
_ring + 1,
+ pmd->cfg.num_
c2s
_rings);
+ pmd->run.num_
s2c_rings = RTE_MIN(h->max_s2c
_ring + 1,
+ pmd->cfg.num_
s2c
_rings);
pmd->run.log2_ring_size = RTE_MIN(h->max_log2_ring_size,
pmd->cfg.log2_ring_size);
pmd->run.pkt_buffer_size = pmd->cfg.pkt_buffer_size;
pmd->run.log2_ring_size = RTE_MIN(h->max_log2_ring_size,
pmd->cfg.log2_ring_size);
pmd->run.pkt_buffer_size = pmd->cfg.pkt_buffer_size;
@@
-203,7
+203,7
@@
memif_msg_receive_init(struct memif_control_channel *cc, memif_msg_t *msg)
dev = elt->dev;
pmd = dev->data->dev_private;
if (((pmd->flags & ETH_MEMIF_FLAG_DISABLED) == 0) &&
dev = elt->dev;
pmd = dev->data->dev_private;
if (((pmd->flags & ETH_MEMIF_FLAG_DISABLED) == 0) &&
- (pmd->id == i->id) && (pmd->role == MEMIF_ROLE_
MAST
ER)) {
+ (pmd->id == i->id) && (pmd->role == MEMIF_ROLE_
SERV
ER)) {
if (pmd->flags & (ETH_MEMIF_FLAG_CONNECTING |
ETH_MEMIF_FLAG_CONNECTED)) {
memif_msg_enq_disconnect(cc,
if (pmd->flags & (ETH_MEMIF_FLAG_CONNECTING |
ETH_MEMIF_FLAG_CONNECTED)) {
memif_msg_enq_disconnect(cc,
@@
-300,21
+300,21
@@
memif_msg_receive_add_ring(struct rte_eth_dev *dev, memif_msg_t *msg, int fd)
}
/* check if we have enough queues */
}
/* check if we have enough queues */
- if (ar->flags & MEMIF_MSG_ADD_RING_FLAG_
S2M
) {
- if (ar->index >= pmd->cfg.num_
s2m
_rings) {
+ if (ar->flags & MEMIF_MSG_ADD_RING_FLAG_
C2S
) {
+ if (ar->index >= pmd->cfg.num_
c2s
_rings) {
memif_msg_enq_disconnect(pmd->cc, "Invalid ring index", 0);
return -1;
}
memif_msg_enq_disconnect(pmd->cc, "Invalid ring index", 0);
return -1;
}
- pmd->run.num_
s2m
_rings++;
+ pmd->run.num_
c2s
_rings++;
} else {
} else {
- if (ar->index >= pmd->cfg.num_
m2s
_rings) {
+ if (ar->index >= pmd->cfg.num_
s2c
_rings) {
memif_msg_enq_disconnect(pmd->cc, "Invalid ring index", 0);
return -1;
}
memif_msg_enq_disconnect(pmd->cc, "Invalid ring index", 0);
return -1;
}
- pmd->run.num_
m2s
_rings++;
+ pmd->run.num_
s2c
_rings++;
}
}
- mq = (ar->flags & MEMIF_MSG_ADD_RING_FLAG_
S2M
) ?
+ mq = (ar->flags & MEMIF_MSG_ADD_RING_FLAG_
C2S
) ?
dev->data->rx_queues[ar->index] : dev->data->tx_queues[ar->index];
mq->intr_handle.fd = fd;
dev->data->rx_queues[ar->index] : dev->data->tx_queues[ar->index];
mq->intr_handle.fd = fd;
@@
-449,7
+449,7
@@
memif_msg_enq_add_ring(struct rte_eth_dev *dev, uint8_t idx,
return -1;
ar = &e->msg.add_ring;
return -1;
ar = &e->msg.add_ring;
- mq = (type == MEMIF_RING_
S2M
) ? dev->data->tx_queues[idx] :
+ mq = (type == MEMIF_RING_
C2S
) ? dev->data->tx_queues[idx] :
dev->data->rx_queues[idx];
e->msg.type = MEMIF_MSG_TYPE_ADD_RING;
dev->data->rx_queues[idx];
e->msg.type = MEMIF_MSG_TYPE_ADD_RING;
@@
-458,7
+458,7
@@
memif_msg_enq_add_ring(struct rte_eth_dev *dev, uint8_t idx,
ar->offset = mq->ring_offset;
ar->region = mq->region;
ar->log2_ring_size = mq->log2_ring_size;
ar->offset = mq->ring_offset;
ar->region = mq->region;
ar->log2_ring_size = mq->log2_ring_size;
- ar->flags = (type == MEMIF_RING_
S2M) ? MEMIF_MSG_ADD_RING_FLAG_S2M
: 0;
+ ar->flags = (type == MEMIF_RING_
C2S) ? MEMIF_MSG_ADD_RING_FLAG_C2S
: 0;
ar->private_hdr_size = 0;
return 0;
ar->private_hdr_size = 0;
return 0;
@@
-575,8
+575,8
@@
memif_disconnect(struct rte_eth_dev *dev)
rte_spinlock_unlock(&pmd->cc_lock);
/* unconfig interrupts */
rte_spinlock_unlock(&pmd->cc_lock);
/* unconfig interrupts */
- for (i = 0; i < pmd->cfg.num_
s2m
_rings; i++) {
- if (pmd->role == MEMIF_ROLE_
SLAVE
) {
+ for (i = 0; i < pmd->cfg.num_
c2s
_rings; i++) {
+ if (pmd->role == MEMIF_ROLE_
CLIENT
) {
if (dev->data->tx_queues != NULL)
mq = dev->data->tx_queues[i];
else
if (dev->data->tx_queues != NULL)
mq = dev->data->tx_queues[i];
else
@@
-592,8
+592,8
@@
memif_disconnect(struct rte_eth_dev *dev)
mq->intr_handle.fd = -1;
}
}
mq->intr_handle.fd = -1;
}
}
- for (i = 0; i < pmd->cfg.num_
m2s
_rings; i++) {
- if (pmd->role == MEMIF_ROLE_
MAST
ER) {
+ for (i = 0; i < pmd->cfg.num_
s2c
_rings; i++) {
+ if (pmd->role == MEMIF_ROLE_
SERV
ER) {
if (dev->data->tx_queues != NULL)
mq = dev->data->tx_queues[i];
else
if (dev->data->tx_queues != NULL)
mq = dev->data->tx_queues[i];
else
@@
-616,7
+616,7
@@
memif_disconnect(struct rte_eth_dev *dev)
memset(&pmd->run, 0, sizeof(pmd->run));
MIF_LOG(DEBUG, "Disconnected, id: %d, role: %s.", pmd->id,
memset(&pmd->run, 0, sizeof(pmd->run));
MIF_LOG(DEBUG, "Disconnected, id: %d, role: %s.", pmd->id,
- (pmd->role == MEMIF_ROLE_
MASTER) ? "master" : "slave
");
+ (pmd->role == MEMIF_ROLE_
SERVER) ? "server" : "client
");
}
static int
}
static int
@@
-694,15
+694,15
@@
memif_msg_receive(struct memif_control_channel *cc)
if (ret < 0)
goto exit;
}
if (ret < 0)
goto exit;
}
- for (i = 0; i < pmd->run.num_
s2m
_rings; i++) {
+ for (i = 0; i < pmd->run.num_
c2s
_rings; i++) {
ret = memif_msg_enq_add_ring(cc->dev, i,
ret = memif_msg_enq_add_ring(cc->dev, i,
- MEMIF_RING_
S2M
);
+ MEMIF_RING_
C2S
);
if (ret < 0)
goto exit;
}
if (ret < 0)
goto exit;
}
- for (i = 0; i < pmd->run.num_
m2s
_rings; i++) {
+ for (i = 0; i < pmd->run.num_
s2c
_rings; i++) {
ret = memif_msg_enq_add_ring(cc->dev, i,
ret = memif_msg_enq_add_ring(cc->dev, i,
- MEMIF_RING_
M2S
);
+ MEMIF_RING_
S2C
);
if (ret < 0)
goto exit;
}
if (ret < 0)
goto exit;
}
@@
-969,7
+969,7
@@
memif_socket_init(struct rte_eth_dev *dev, const char *socket_filename)
ret = rte_hash_lookup_data(hash, key, (void **)&socket);
if (ret < 0) {
socket = memif_socket_create(key,
ret = rte_hash_lookup_data(hash, key, (void **)&socket);
if (ret < 0) {
socket = memif_socket_create(key,
- (pmd->role == MEMIF_ROLE_
SLAVE
) ? 0 : 1,
+ (pmd->role == MEMIF_ROLE_
CLIENT
) ? 0 : 1,
pmd->flags & ETH_MEMIF_FLAG_SOCKET_ABSTRACT);
if (socket == NULL)
return -1;
pmd->flags & ETH_MEMIF_FLAG_SOCKET_ABSTRACT);
if (socket == NULL)
return -1;
@@
-1046,7
+1046,7
@@
memif_socket_remove_device(struct rte_eth_dev *dev)
}
int
}
int
-memif_connect_
mast
er(struct rte_eth_dev *dev)
+memif_connect_
serv
er(struct rte_eth_dev *dev)
{
struct pmd_internals *pmd = dev->data->dev_private;
{
struct pmd_internals *pmd = dev->data->dev_private;
@@
-1057,7
+1057,7
@@
memif_connect_master(struct rte_eth_dev *dev)
}
int
}
int
-memif_connect_
slave
(struct rte_eth_dev *dev)
+memif_connect_
client
(struct rte_eth_dev *dev)
{
int sockfd;
int ret;
{
int sockfd;
int ret;