IB/mlx5: Introduce flow steering matcher uapi object (fd44e385) · Commits · 戴 / test

drivers/infiniband/core/uverbs_std_types_flow_action.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -376,8 +376,7 @@ static const struct uverbs_attr_spec uverbs_flow_action_esp_keymat[] = {
		static const struct uverbs_attr_spec uverbs_flow_action_esp_replay[] = {
		[IB_UVERBS_FLOW_ACTION_ESP_REPLAY_NONE] = {
		.type = UVERBS_ATTR_TYPE_PTR_IN,
		/* No need to specify any data */
		UVERBS_ATTR_SIZE(0, 0),
		UVERBS_ATTR_NO_DATA(),
		},
		[IB_UVERBS_FLOW_ACTION_ESP_REPLAY_BMP] = {
		.type = UVERBS_ATTR_TYPE_PTR_IN,

drivers/infiniband/hw/mlx5/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -4,3 +4,4 @@ mlx5_ib-y := main.o cq.o doorbell.o qp.o mem.o srq.o mr.o ah.o mad.o gsi.o ib_vi
		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
		mlx5_ib-$(CONFIG_INFINIBAND_USER_ACCESS) += flow.o

drivers/infiniband/hw/mlx5/flow.c

0 → 100644

+134 −0

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

		#include <rdma/ib_user_verbs.h>
		#include <rdma/ib_verbs.h>
		#include <rdma/uverbs_types.h>
		#include <rdma/uverbs_ioctl.h>
		#include <rdma/mlx5_user_ioctl_cmds.h>
		#include <rdma/ib_umem.h>
		#include <linux/mlx5/driver.h>
		#include <linux/mlx5/fs.h>
		#include "mlx5_ib.h"

		#define UVERBS_MODULE_NAME mlx5_ib
		#include <rdma/uverbs_named_ioctl.h>

		static const struct uverbs_attr_spec mlx5_ib_flow_type[] = {
		[MLX5_IB_FLOW_TYPE_NORMAL] = {
		.type = UVERBS_ATTR_TYPE_PTR_IN,
		.u.ptr = {
		.len = sizeof(u16), /* data is priority */
		.min_len = sizeof(u16),
		}
		},
		[MLX5_IB_FLOW_TYPE_SNIFFER] = {
		.type = UVERBS_ATTR_TYPE_PTR_IN,
		UVERBS_ATTR_NO_DATA(),
		},
		[MLX5_IB_FLOW_TYPE_ALL_DEFAULT] = {
		.type = UVERBS_ATTR_TYPE_PTR_IN,
		UVERBS_ATTR_NO_DATA(),
		},
		[MLX5_IB_FLOW_TYPE_MC_DEFAULT] = {
		.type = UVERBS_ATTR_TYPE_PTR_IN,
		UVERBS_ATTR_NO_DATA(),
		},
		};

		static int flow_matcher_cleanup(struct ib_uobject *uobject,
		enum rdma_remove_reason why)
		{
		struct mlx5_ib_flow_matcher *obj = uobject->object;
		int ret;

		ret = ib_destroy_usecnt(&obj->usecnt, why, uobject);
		if (ret)
		return ret;

		kfree(obj);
		return 0;
		}

		static int UVERBS_HANDLER(MLX5_IB_METHOD_FLOW_MATCHER_CREATE)(
		struct ib_device ib_dev, struct ib_uverbs_file file,
		struct uverbs_attr_bundle *attrs)
		{
		struct ib_uobject *uobj = uverbs_attr_get_uobject(
		attrs, MLX5_IB_ATTR_FLOW_MATCHER_CREATE_HANDLE);
		struct mlx5_ib_dev *dev = to_mdev(uobj->context->device);
		struct mlx5_ib_flow_matcher *obj;
		int err;

		obj = kzalloc(sizeof(struct mlx5_ib_flow_matcher), GFP_KERNEL);
		if (!obj)
		return -ENOMEM;

		obj->mask_len = uverbs_attr_get_len(
		attrs, MLX5_IB_ATTR_FLOW_MATCHER_MATCH_MASK);
		err = uverbs_copy_from(&obj->matcher_mask,
		attrs,
		MLX5_IB_ATTR_FLOW_MATCHER_MATCH_MASK);
		if (err)
		goto end;

		obj->flow_type = uverbs_attr_get_enum_id(
		attrs, MLX5_IB_ATTR_FLOW_MATCHER_FLOW_TYPE);

		if (obj->flow_type == MLX5_IB_FLOW_TYPE_NORMAL) {
		err = uverbs_copy_from(&obj->priority,
		attrs,
		MLX5_IB_ATTR_FLOW_MATCHER_FLOW_TYPE);
		if (err)
		goto end;
		}

		err = uverbs_copy_from(&obj->match_criteria_enable,
		attrs,
		MLX5_IB_ATTR_FLOW_MATCHER_MATCH_CRITERIA);
		if (err)
		goto end;

		uobj->object = obj;
		obj->mdev = dev->mdev;
		atomic_set(&obj->usecnt, 0);
		return 0;

		end:
		kfree(obj);
		return err;
		}

		DECLARE_UVERBS_NAMED_METHOD(
		MLX5_IB_METHOD_FLOW_MATCHER_CREATE,
		UVERBS_ATTR_IDR(MLX5_IB_ATTR_FLOW_MATCHER_CREATE_HANDLE,
		MLX5_IB_OBJECT_FLOW_MATCHER,
		UVERBS_ACCESS_NEW,
		UA_MANDATORY),
		UVERBS_ATTR_PTR_IN(
		MLX5_IB_ATTR_FLOW_MATCHER_MATCH_MASK,
		UVERBS_ATTR_SIZE(1, sizeof(struct mlx5_ib_match_params)),
		UA_MANDATORY),
		UVERBS_ATTR_ENUM_IN(MLX5_IB_ATTR_FLOW_MATCHER_FLOW_TYPE,
		mlx5_ib_flow_type,
		UA_MANDATORY),
		UVERBS_ATTR_PTR_IN(MLX5_IB_ATTR_FLOW_MATCHER_MATCH_CRITERIA,
		UVERBS_ATTR_TYPE(u8),
		UA_MANDATORY));

		DECLARE_UVERBS_NAMED_METHOD_DESTROY(
		MLX5_IB_METHOD_FLOW_MATCHER_DESTROY,
		UVERBS_ATTR_IDR(MLX5_IB_ATTR_FLOW_MATCHER_DESTROY_HANDLE,
		MLX5_IB_OBJECT_FLOW_MATCHER,
		UVERBS_ACCESS_DESTROY,
		UA_MANDATORY));

		DECLARE_UVERBS_NAMED_OBJECT(MLX5_IB_OBJECT_FLOW_MATCHER,
		UVERBS_TYPE_ALLOC_IDR(flow_matcher_cleanup),
		&UVERBS_METHOD(MLX5_IB_METHOD_FLOW_MATCHER_CREATE),
		&UVERBS_METHOD(MLX5_IB_METHOD_FLOW_MATCHER_DESTROY));

		DECLARE_UVERBS_OBJECT_TREE(flow_objects,
		&UVERBS_OBJECT(MLX5_IB_OBJECT_FLOW_MATCHER));

drivers/infiniband/hw/mlx5/mlx5_ib.h

+11 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,7 @@
		#include <rdma/ib_user_verbs.h>
		#include <rdma/mlx5-abi.h>
		#include <rdma/uverbs_ioctl.h>
		#include <rdma/mlx5_user_ioctl_cmds.h>

		#define mlx5_ib_dbg(dev, format, arg...) \
		pr_debug("%s:%s:%d:(pid %d): " format, (dev)->ib_dev.name, __func__, \
		@@ -173,6 +174,16 @@ struct mlx5_ib_flow_handler {
		struct ib_counters *ibcounters;
		};

		struct mlx5_ib_flow_matcher {
		struct mlx5_ib_match_params matcher_mask;
		int mask_len;
		enum mlx5_ib_flow_type flow_type;
		u16 priority;
		struct mlx5_core_dev *mdev;
		atomic_t usecnt;
		u8 match_criteria_enable;
		};

		struct mlx5_ib_flow_db {
		struct mlx5_ib_flow_prio prios[MLX5_IB_NUM_FLOW_FT];
		struct mlx5_ib_flow_prio sniffer[MLX5_IB_NUM_SNIFFER_FTS];

include/rdma/uverbs_ioctl.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -204,6 +204,8 @@ struct uverbs_object_tree_def {
		#define UVERBS_ATTR_SIZE(_min_len, _len) \
		.u.ptr.min_len = _min_len, .u.ptr.len = _len

		#define UVERBS_ATTR_NO_DATA() UVERBS_ATTR_SIZE(0, 0)

		/*
		* Specifies a uapi structure that cannot be extended. The user must always
		* supply the whole structure and nothing more. The structure must be declared

Admin message