RDMA/mlx5: Separate flow steering logic from main.c (f7c4ffda) · Commits · 戴 / test

drivers/infiniband/hw/mlx5/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,6 +23,6 @@ mlx5_ib-y := ah.o \
		mlx5_ib-$(CONFIG_INFINIBAND_ON_DEMAND_PAGING) += odp.o
		mlx5_ib-$(CONFIG_MLX5_ESWITCH) += ib_rep.o
		mlx5_ib-$(CONFIG_INFINIBAND_USER_ACCESS) += devx.o \
		flow.o \
		fs.o \
		qos.o \
		std_types.o

drivers/infiniband/hw/mlx5/devx.c

+1 −58

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@
		#include <linux/mlx5/driver.h>
		#include <linux/mlx5/fs.h>
		#include "mlx5_ib.h"
		#include "devx.h"
		#include "qp.h"
		#include <linux/xarray.h>

		@@ -89,22 +90,6 @@ struct devx_async_event_file {
		u8 is_destroyed:1;
		};

		#define MLX5_MAX_DESTROY_INBOX_SIZE_DW MLX5_ST_SZ_DW(delete_fte_in)
		struct devx_obj {
		struct mlx5_ib_dev *ib_dev;
		u64 obj_id;
		u32 dinlen; /* destroy inbox length */
		u32 dinbox[MLX5_MAX_DESTROY_INBOX_SIZE_DW];
		u32 flags;
		union {
		struct mlx5_ib_devx_mr devx_mr;
		struct mlx5_core_dct core_dct;
		struct mlx5_core_cq core_cq;
		u32 flow_counter_bulk_size;
		};
		struct list_head event_sub; /* holds devx_event_subscription entries */
		};

		struct devx_umem {
		struct mlx5_core_dev *mdev;
		struct ib_umem *umem;
		@@ -171,48 +156,6 @@ void mlx5_ib_devx_destroy(struct mlx5_ib_dev *dev, u16 uid)
		mlx5_cmd_exec(dev->mdev, in, sizeof(in), out, sizeof(out));
		}

		bool mlx5_ib_devx_is_flow_dest(void obj, int dest_id, int *dest_type)
		{
		struct devx_obj *devx_obj = obj;
		u16 opcode = MLX5_GET(general_obj_in_cmd_hdr, devx_obj->dinbox, opcode);

		switch (opcode) {
		case MLX5_CMD_OP_DESTROY_TIR:
		*dest_type = MLX5_FLOW_DESTINATION_TYPE_TIR;
		*dest_id = MLX5_GET(general_obj_in_cmd_hdr, devx_obj->dinbox,
		obj_id);
		return true;

		case MLX5_CMD_OP_DESTROY_FLOW_TABLE:
		*dest_type = MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE;
		*dest_id = MLX5_GET(destroy_flow_table_in, devx_obj->dinbox,
		table_id);
		return true;
		default:
		return false;
		}
		}

		bool mlx5_ib_devx_is_flow_counter(void obj, u32 offset, u32 counter_id)
		{
		struct devx_obj *devx_obj = obj;
		u16 opcode = MLX5_GET(general_obj_in_cmd_hdr, devx_obj->dinbox, opcode);

		if (opcode == MLX5_CMD_OP_DEALLOC_FLOW_COUNTER) {

		if (offset && offset >= devx_obj->flow_counter_bulk_size)
		return false;

		*counter_id = MLX5_GET(dealloc_flow_counter_in,
		devx_obj->dinbox,
		flow_counter_id);
		*counter_id += offset;
		return true;
		}

		return false;
		}

		static bool is_legacy_unaffiliated_event_num(u16 event_num)
		{
		switch (event_num) {

drivers/infiniband/hw/mlx5/devx.h

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */
		/*
		* Copyright (c) 2019-2020, Mellanox Technologies inc. All rights reserved.
		*/

		#ifndef _MLX5_IB_DEVX_H
		#define _MLX5_IB_DEVX_H

		#include "mlx5_ib.h"

		#define MLX5_MAX_DESTROY_INBOX_SIZE_DW MLX5_ST_SZ_DW(delete_fte_in)
		struct devx_obj {
		struct mlx5_ib_dev *ib_dev;
		u64 obj_id;
		u32 dinlen; /* destroy inbox length */
		u32 dinbox[MLX5_MAX_DESTROY_INBOX_SIZE_DW];
		u32 flags;
		union {
		struct mlx5_ib_devx_mr devx_mr;
		struct mlx5_core_dct core_dct;
		struct mlx5_core_cq core_cq;
		u32 flow_counter_bulk_size;
		};
		struct list_head event_sub; /* holds devx_event_subscription entries */
		};
		#endif /* _MLX5_IB_DEVX_H */

drivers/infiniband/hw/mlx5/flow.c

deleted100644 → 0

+0 −765

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/infiniband/hw/mlx5/fs.c

0 → 100644

+2514 −0

File added.

Preview size limit exceeded, changes collapsed.

Admin message