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/failsafe: fix RSS hash offload reporting
[dpdk.git]
/
drivers
/
net
/
mlx5
/
mlx5_vlan.c
diff --git
a/drivers/net/mlx5/mlx5_vlan.c
b/drivers/net/mlx5/mlx5_vlan.c
index
f6643fc
..
64678d3
100644
(file)
--- a/
drivers/net/mlx5/mlx5_vlan.c
+++ b/
drivers/net/mlx5/mlx5_vlan.c
@@
-1,30
+1,23
@@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright 2015 6WIND S.A.
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright 2015 6WIND S.A.
- * Copyright 2015 Mellanox
.
+ * Copyright 2015 Mellanox
Technologies, Ltd
*/
#include <stddef.h>
#include <errno.h>
*/
#include <stddef.h>
#include <errno.h>
-#include <assert.h>
#include <stdint.h>
#include <stdint.h>
+#include <unistd.h>
-/* Verbs headers do not support -pedantic. */
-#ifdef PEDANTIC
-#pragma GCC diagnostic ignored "-Wpedantic"
-#endif
-#include <infiniband/mlx5dv.h>
-#include <infiniband/verbs.h>
-#ifdef PEDANTIC
-#pragma GCC diagnostic error "-Wpedantic"
-#endif
-
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
#include <rte_common.h>
#include <rte_common.h>
+#include <rte_malloc.h>
+#include <rte_hypervisor.h>
-#include "mlx5_utils.h"
#include "mlx5.h"
#include "mlx5_autoconf.h"
#include "mlx5.h"
#include "mlx5_autoconf.h"
-#include "mlx5_glue.h"
+#include "mlx5_rxtx.h"
+#include "mlx5_utils.h"
+#include "mlx5_devx.h"
/**
* DPDK callback to configure a VLAN filter.
/**
* DPDK callback to configure a VLAN filter.
@@
-42,12
+35,12
@@
int
mlx5_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
{
int
mlx5_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
{
- struct priv *priv = dev->data->dev_private;
+ struct
mlx5_
priv *priv = dev->data->dev_private;
unsigned int i;
unsigned int i;
- D
EBUG(
"port %u %s VLAN filter ID %" PRIu16,
- dev->data->port_id, (on ? "enable" : "disable"), vlan_id);
-
assert
(priv->vlan_filter_n <= RTE_DIM(priv->vlan_filter));
+ D
RV_LOG(DEBUG,
"port %u %s VLAN filter ID %" PRIu16,
+
dev->data->port_id, (on ? "enable" : "disable"), vlan_id);
+
MLX5_ASSERT
(priv->vlan_filter_n <= RTE_DIM(priv->vlan_filter));
for (i = 0; (i != priv->vlan_filter_n); ++i)
if (priv->vlan_filter[i] == vlan_id)
break;
for (i = 0; (i != priv->vlan_filter_n); ++i)
if (priv->vlan_filter[i] == vlan_id)
break;
@@
-57,7
+50,7
@@
mlx5_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
return -rte_errno;
}
if (i < priv->vlan_filter_n) {
return -rte_errno;
}
if (i < priv->vlan_filter_n) {
-
assert
(priv->vlan_filter_n != 0);
+
MLX5_ASSERT
(priv->vlan_filter_n != 0);
/* Enabling an existing VLAN filter has no effect. */
if (on)
goto out;
/* Enabling an existing VLAN filter has no effect. */
if (on)
goto out;
@@
-69,7
+62,7
@@
mlx5_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
(priv->vlan_filter_n - i));
priv->vlan_filter[priv->vlan_filter_n] = 0;
} else {
(priv->vlan_filter_n - i));
priv->vlan_filter[priv->vlan_filter_n] = 0;
} else {
-
assert
(i == priv->vlan_filter_n);
+
MLX5_ASSERT
(i == priv->vlan_filter_n);
/* Disabling an unknown VLAN filter has no effect. */
if (!on)
goto out;
/* Disabling an unknown VLAN filter has no effect. */
if (!on)
goto out;
@@
-96,44
+89,35
@@
out:
void
mlx5_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on)
{
void
mlx5_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on)
{
- struct priv *priv = dev->data->dev_private;
+ struct
mlx5_
priv *priv = dev->data->dev_private;
struct mlx5_rxq_data *rxq = (*priv->rxqs)[queue];
struct mlx5_rxq_ctrl *rxq_ctrl =
container_of(rxq, struct mlx5_rxq_ctrl, rxq);
struct mlx5_rxq_data *rxq = (*priv->rxqs)[queue];
struct mlx5_rxq_ctrl *rxq_ctrl =
container_of(rxq, struct mlx5_rxq_ctrl, rxq);
- struct ibv_wq_attr mod;
- uint16_t vlan_offloads =
- (on ? IBV_WQ_FLAGS_CVLAN_STRIPPING : 0) |
- 0;
- int ret;
+ int ret = 0;
/* Validate hw support */
if (!priv->config.hw_vlan_strip) {
/* Validate hw support */
if (!priv->config.hw_vlan_strip) {
-
ERROR(
"port %u VLAN stripping is not supported",
- dev->data->port_id);
+
DRV_LOG(ERR,
"port %u VLAN stripping is not supported",
+
dev->data->port_id);
return;
}
/* Validate queue number */
if (queue >= priv->rxqs_n) {
return;
}
/* Validate queue number */
if (queue >= priv->rxqs_n) {
-
ERROR(
"port %u VLAN stripping, invalid queue number %d",
- dev->data->port_id, queue);
+
DRV_LOG(ERR,
"port %u VLAN stripping, invalid queue number %d",
+
dev->data->port_id, queue);
return;
}
return;
}
- D
EBUG("port %u set VLAN offloads 0x%x
for port %uqueue %d",
-
dev->data->port_id, vlan_offloads
, rxq->port_id, queue);
- if (!rxq_ctrl->
ibv
) {
+ D
RV_LOG(DEBUG, "port %u set VLAN stripping offloads %d
for port %uqueue %d",
+
dev->data->port_id, on
, rxq->port_id, queue);
+ if (!rxq_ctrl->
obj
) {
/* Update related bits in RX queue. */
rxq->vlan_strip = !!on;
return;
}
/* Update related bits in RX queue. */
rxq->vlan_strip = !!on;
return;
}
- mod = (struct ibv_wq_attr){
- .attr_mask = IBV_WQ_ATTR_FLAGS,
- .flags_mask = IBV_WQ_FLAGS_CVLAN_STRIPPING,
- .flags = vlan_offloads,
- };
- ret = mlx5_glue->modify_wq(rxq_ctrl->ibv->wq, &mod);
+ ret = priv->obj_ops.rxq_obj_modify_vlan_strip(rxq_ctrl->obj, on);
if (ret) {
if (ret) {
- ERROR("port %u failed to modified stripping mode: %s",
- dev->data->port_id, strerror(rte_errno));
+ DRV_LOG(ERR, "Port %u failed to modify object stripping mode:"
+
" %s",
dev->data->port_id, strerror(rte_errno));
return;
}
/* Update related bits in RX queue. */
return;
}
/* Update related bits in RX queue. */
@@
-154,7
+138,7
@@
mlx5_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on)
int
mlx5_vlan_offload_set(struct rte_eth_dev *dev, int mask)
{
int
mlx5_vlan_offload_set(struct rte_eth_dev *dev, int mask)
{
- struct priv *priv = dev->data->dev_private;
+ struct
mlx5_
priv *priv = dev->data->dev_private;
unsigned int i;
if (mask & ETH_VLAN_STRIP_MASK) {
unsigned int i;
if (mask & ETH_VLAN_STRIP_MASK) {
@@
-162,8
+146,8
@@
mlx5_vlan_offload_set(struct rte_eth_dev *dev, int mask)
DEV_RX_OFFLOAD_VLAN_STRIP);
if (!priv->config.hw_vlan_strip) {
DEV_RX_OFFLOAD_VLAN_STRIP);
if (!priv->config.hw_vlan_strip) {
-
ERROR(
"port %u VLAN stripping is not supported",
- dev->data->port_id);
+
DRV_LOG(ERR,
"port %u VLAN stripping is not supported",
+
dev->data->port_id);
return 0;
}
/* Run on every RX queue and set/reset VLAN stripping. */
return 0;
}
/* Run on every RX queue and set/reset VLAN stripping. */