Modify API mlx5_flow_dev_dump to support the feature.
Modify mlx5_socket since one extra arg flow_ptr is added.
Signed-off-by: Haifei Luo <haif...@nvidia.com>
---
drivers/net/mlx5/linux/mlx5_socket.c | 30 ++++++++++++++++++++++++------
drivers/net/mlx5/mlx5_flow.c | 29 +++++++++++++++++++++++++++--
2 files changed, 51 insertions(+), 8 deletions(-)
diff --git a/drivers/net/mlx5/linux/mlx5_socket.c
b/drivers/net/mlx5/linux/mlx5_socket.c
index 6e354f4..2ef837c 100644
--- a/drivers/net/mlx5/linux/mlx5_socket.c
+++ b/drivers/net/mlx5/linux/mlx5_socket.c
@@ -2,6 +2,10 @@
* Copyright 2019 Mellanox Technologies, Ltd
*/
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
@@ -29,11 +33,15 @@
{
int conn_sock;
int ret;
+ int j;
struct cmsghdr *cmsg = NULL;
- int data;
+ #define LENGTH 9
+ /* The first byte for port_id and the rest for flowptr. */
+ int data[LENGTH];
+ uint64_t flow_ptr = 0;
char buf[CMSG_SPACE(sizeof(int))] = { 0 };
struct iovec io = {
- .iov_base = &data,
+ .iov_base = &data[0],
.iov_len = sizeof(data),
};
struct msghdr msg = {
@@ -46,7 +54,9 @@
int fd;
FILE *file = NULL;
struct rte_eth_dev *dev;
+ struct rte_flow_error err;
+ memset(data, 0, sizeof(data));
/* Accept the connection from the client. */
conn_sock = accept(server_socket, NULL, NULL);
if (conn_sock < 0) {
@@ -84,15 +94,23 @@
}
/* Dump flow. */
dev = &rte_eth_devices[port_id];
- ret = mlx5_flow_dev_dump(dev, NULL, file, NULL);
+ /* The first byte in data for port_id and the following 8 for flowptr */
+ for (j = 1; j < LENGTH; j++)
+ flow_ptr = (flow_ptr << 8) + data[j];
+ if (flow_ptr == 0)
+ ret = mlx5_flow_dev_dump(dev, NULL, file, NULL);
+ else
+ ret = mlx5_flow_dev_dump(dev,
+ (struct rte_flow *)((uintptr_t)flow_ptr), file, &err);
+
/* Set-up the ancillary data and reply. */
msg.msg_controllen = 0;
msg.msg_control = NULL;
msg.msg_iovlen = 1;
msg.msg_iov = &io;
- data = -ret;
- io.iov_len = sizeof(data);
- io.iov_base = &data;
+ data[0] = -ret;
+ io.iov_len = sizeof(data[0]);
+ io.iov_base = &data[0];
do {
ret = sendmsg(conn_sock, &msg, 0);
} while (ret < 0 && errno == EINTR);
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index bce6ab2..b68909f 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -7183,10 +7183,35 @@ struct mlx5_meter_domains_infos *
return -ENOTSUP;
}
+ /*dump all*/
if (!flow_idx)
return mlx5_devx_cmd_flow_dump(sh->fdb_domain,
- sh->rx_domain, sh->tx_domain, file);
- return -ENOTSUP;
+ sh->rx_domain,
+ sh->tx_domain, file);
+ /*dump one*/
+ uint32_t handle_idx;
+ int ret;
+ struct mlx5_flow_handle *dh;
+ struct rte_flow *flow = mlx5_ipool_get(priv->sh->ipool
+ [MLX5_IPOOL_RTE_FLOW], (uintptr_t)(void *)flow_idx);
+
+ if (!flow)
+ return -ENOENT;
+ handle_idx = flow->dev_handles;
+ while (handle_idx) {
+ dh = mlx5_ipool_get(priv->sh->ipool[MLX5_IPOOL_MLX5_FLOW],
+ handle_idx);
+ if (!dh)
+ return -ENOENT;
+ if (dh->drv_flow) {
+ ret = mlx5_devx_cmd_flow_single_dump(dh->drv_flow,
+ file);
+ if (ret)
+ return -ENOENT;
+ }
+ handle_idx = dh->next.next;
+ }
+ return 0;
}
/**
--
1.8.3.1
