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/virtio: fix vectorized Rx queue rearm
[dpdk.git]
/
drivers
/
net
/
mlx4
/
mlx4_intr.c
diff --git
a/drivers/net/mlx4/mlx4_intr.c
b/drivers/net/mlx4/mlx4_intr.c
index
ec91242
..
d56009c
100644
(file)
--- a/
drivers/net/mlx4/mlx4_intr.c
+++ b/
drivers/net/mlx4/mlx4_intr.c
@@
-8,7
+8,6
@@
* Interrupts handling for mlx4 driver.
*/
* Interrupts handling for mlx4 driver.
*/
-#include <assert.h>
#include <errno.h>
#include <stdint.h>
#include <stdlib.h>
#include <errno.h>
#include <stdint.h>
#include <stdlib.h>
@@
-24,7
+23,7
@@
#include <rte_alarm.h>
#include <rte_errno.h>
#include <rte_alarm.h>
#include <rte_errno.h>
-#include <
rte_
ethdev_driver.h>
+#include <ethdev_driver.h>
#include <rte_io.h>
#include <rte_interrupts.h>
#include <rte_io.h>
#include <rte_interrupts.h>
@@
-65,7
+64,7
@@
static int
mlx4_rx_intr_vec_enable(struct mlx4_priv *priv)
{
unsigned int i;
mlx4_rx_intr_vec_enable(struct mlx4_priv *priv)
{
unsigned int i;
- unsigned int rxqs_n =
priv->dev
->data->nb_rx_queues;
+ unsigned int rxqs_n =
ETH_DEV(priv)
->data->nb_rx_queues;
unsigned int n = RTE_MIN(rxqs_n, (uint32_t)RTE_MAX_RXTX_INTR_VEC_ID);
unsigned int count = 0;
struct rte_intr_handle *intr_handle = &priv->intr_handle;
unsigned int n = RTE_MIN(rxqs_n, (uint32_t)RTE_MAX_RXTX_INTR_VEC_ID);
unsigned int count = 0;
struct rte_intr_handle *intr_handle = &priv->intr_handle;
@@
-79,7
+78,7
@@
mlx4_rx_intr_vec_enable(struct mlx4_priv *priv)
return -rte_errno;
}
for (i = 0; i != n; ++i) {
return -rte_errno;
}
for (i = 0; i != n; ++i) {
- struct rxq *rxq =
priv->dev
->data->rx_queues[i];
+ struct rxq *rxq =
ETH_DEV(priv)
->data->rx_queues[i];
/* Skip queues that cannot request interrupts. */
if (!rxq || !rxq->channel) {
/* Skip queues that cannot request interrupts. */
if (!rxq || !rxq->channel) {
@@
-120,14
+119,14
@@
static void
mlx4_link_status_alarm(struct mlx4_priv *priv)
{
const struct rte_intr_conf *const intr_conf =
mlx4_link_status_alarm(struct mlx4_priv *priv)
{
const struct rte_intr_conf *const intr_conf =
- &
priv->dev
->data->dev_conf.intr_conf;
+ &
ETH_DEV(priv)
->data->dev_conf.intr_conf;
-
assert
(priv->intr_alarm == 1);
+
MLX4_ASSERT
(priv->intr_alarm == 1);
priv->intr_alarm = 0;
if (intr_conf->lsc && !mlx4_link_status_check(priv))
priv->intr_alarm = 0;
if (intr_conf->lsc && !mlx4_link_status_check(priv))
-
_rte_eth_dev_callback_process(priv->dev
,
-
RTE_ETH_EVENT_INTR_LSC,
-
NULL);
+
rte_eth_dev_callback_process(ETH_DEV(priv)
,
+ RTE_ETH_EVENT_INTR_LSC,
+ NULL);
}
/**
}
/**
@@
-145,8
+144,8
@@
mlx4_link_status_alarm(struct mlx4_priv *priv)
static int
mlx4_link_status_check(struct mlx4_priv *priv)
{
static int
mlx4_link_status_check(struct mlx4_priv *priv)
{
- struct rte_eth_link *link = &
priv->dev
->data->dev_link;
- int ret = mlx4_link_update(
priv->dev
, 0);
+ struct rte_eth_link *link = &
ETH_DEV(priv)
->data->dev_link;
+ int ret = mlx4_link_update(
ETH_DEV(priv)
, 0);
if (ret)
return ret;
if (ret)
return ret;
@@
-185,7
+184,7
@@
mlx4_interrupt_handler(struct mlx4_priv *priv)
uint32_t caught[RTE_DIM(type)] = { 0 };
struct ibv_async_event event;
const struct rte_intr_conf *const intr_conf =
uint32_t caught[RTE_DIM(type)] = { 0 };
struct ibv_async_event event;
const struct rte_intr_conf *const intr_conf =
- &
priv->dev
->data->dev_conf.intr_conf;
+ &
ETH_DEV(priv)
->data->dev_conf.intr_conf;
unsigned int i;
/* Read all message and acknowledge them. */
unsigned int i;
/* Read all message and acknowledge them. */
@@
-208,8
+207,8
@@
mlx4_interrupt_handler(struct mlx4_priv *priv)
}
for (i = 0; i != RTE_DIM(caught); ++i)
if (caught[i])
}
for (i = 0; i != RTE_DIM(caught); ++i)
if (caught[i])
-
_rte_eth_dev_callback_process(priv->dev
, type[i],
-
NULL);
+
rte_eth_dev_callback_process(ETH_DEV(priv)
, type[i],
+ NULL);
}
/**
}
/**
@@
-282,7
+281,7
@@
int
mlx4_intr_install(struct mlx4_priv *priv)
{
const struct rte_intr_conf *const intr_conf =
mlx4_intr_install(struct mlx4_priv *priv)
{
const struct rte_intr_conf *const intr_conf =
- &
priv->dev
->data->dev_conf.intr_conf;
+ &
ETH_DEV(priv)
->data->dev_conf.intr_conf;
int rc;
mlx4_intr_uninstall(priv);
int rc;
mlx4_intr_uninstall(priv);
@@
-327,13
+326,20
@@
mlx4_rx_intr_disable(struct rte_eth_dev *dev, uint16_t idx)
} else {
ret = mlx4_glue->get_cq_event(rxq->cq->channel, &ev_cq,
&ev_ctx);
} else {
ret = mlx4_glue->get_cq_event(rxq->cq->channel, &ev_cq,
&ev_ctx);
- if (ret || ev_cq != rxq->cq)
+ /** For non-zero ret save the errno (may be EAGAIN
+ * which means the get_cq_event function was called before
+ * receiving one).
+ */
+ if (ret)
+ ret = errno;
+ else if (ev_cq != rxq->cq)
ret = EINVAL;
}
if (ret) {
rte_errno = ret;
ret = EINVAL;
}
if (ret) {
rte_errno = ret;
- WARN("unable to disable interrupt on rx queue %d",
- idx);
+ if (ret != EAGAIN)
+ WARN("unable to disable interrupt on rx queue %d",
+ idx);
} else {
rxq->mcq.arm_sn++;
mlx4_glue->ack_cq_events(rxq->cq, 1);
} else {
rxq->mcq.arm_sn++;
mlx4_glue->ack_cq_events(rxq->cq, 1);
@@
-381,7
+387,7
@@
int
mlx4_rxq_intr_enable(struct mlx4_priv *priv)
{
const struct rte_intr_conf *const intr_conf =
mlx4_rxq_intr_enable(struct mlx4_priv *priv)
{
const struct rte_intr_conf *const intr_conf =
- &
priv->dev
->data->dev_conf.intr_conf;
+ &
ETH_DEV(priv)
->data->dev_conf.intr_conf;
if (intr_conf->rxq && mlx4_rx_intr_vec_enable(priv) < 0)
goto error;
if (intr_conf->rxq && mlx4_rx_intr_vec_enable(priv) < 0)
goto error;