Merge branch 'mlx5_packet_pacing' into rdma.git for-next (3e3cf2e8) · Commits · 戴 / test

drivers/infiniband/hw/mlx5/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -8,3 +8,4 @@ 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
		mlx5_ib-$(CONFIG_INFINIBAND_USER_ACCESS) += qos.o

drivers/infiniband/hw/mlx5/main.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -6251,6 +6251,7 @@ ADD_UVERBS_ATTRIBUTES_SIMPLE(
		static const struct uapi_definition mlx5_ib_defs[] = {
		UAPI_DEF_CHAIN(mlx5_ib_devx_defs),
		UAPI_DEF_CHAIN(mlx5_ib_flow_defs),
		UAPI_DEF_CHAIN(mlx5_ib_qos_defs),

		UAPI_DEF_CHAIN_OBJ_TREE(UVERBS_OBJECT_FLOW_ACTION,
		&mlx5_ib_flow_action),

drivers/infiniband/hw/mlx5/mlx5_ib.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -203,6 +203,11 @@ struct mlx5_ib_flow_matcher {
		u8 match_criteria_enable;
		};

		struct mlx5_ib_pp {
		u16 index;
		struct mlx5_core_dev *mdev;
		};

		struct mlx5_ib_flow_db {
		struct mlx5_ib_flow_prio prios[MLX5_IB_NUM_FLOW_FT];
		struct mlx5_ib_flow_prio egress_prios[MLX5_IB_NUM_FLOW_FT];
		@@ -1383,6 +1388,7 @@ int mlx5_ib_fill_stat_entry(struct sk_buff *msg,

		extern const struct uapi_definition mlx5_ib_devx_defs[];
		extern const struct uapi_definition mlx5_ib_flow_defs[];
		extern const struct uapi_definition mlx5_ib_qos_defs[];

		#if IS_ENABLED(CONFIG_INFINIBAND_USER_ACCESS)
		int mlx5_ib_devx_create(struct mlx5_ib_dev *dev, bool is_user);

drivers/infiniband/hw/mlx5/qos.c

0 → 100644

+136 −0

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

		#include <rdma/uverbs_ioctl.h>
		#include <rdma/mlx5_user_ioctl_cmds.h>
		#include <rdma/mlx5_user_ioctl_verbs.h>
		#include <linux/mlx5/driver.h>
		#include "mlx5_ib.h"

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

		static bool pp_is_supported(struct ib_device *device)
		{
		struct mlx5_ib_dev *dev = to_mdev(device);

		return (MLX5_CAP_GEN(dev->mdev, qos) &&
		MLX5_CAP_QOS(dev->mdev, packet_pacing) &&
		MLX5_CAP_QOS(dev->mdev, packet_pacing_uid));
		}

		static int UVERBS_HANDLER(MLX5_IB_METHOD_PP_OBJ_ALLOC)(
		struct uverbs_attr_bundle *attrs)
		{
		u8 rl_raw[MLX5_ST_SZ_BYTES(set_pp_rate_limit_context)] = {};
		struct ib_uobject *uobj = uverbs_attr_get_uobject(attrs,
		MLX5_IB_ATTR_PP_OBJ_ALLOC_HANDLE);
		struct mlx5_ib_dev *dev;
		struct mlx5_ib_ucontext *c;
		struct mlx5_ib_pp *pp_entry;
		void *in_ctx;
		u16 uid;
		int inlen;
		u32 flags;
		int err;

		c = to_mucontext(ib_uverbs_get_ucontext(attrs));
		if (IS_ERR(c))
		return PTR_ERR(c);

		/* The allocated entry can be used only by a DEVX context */
		if (!c->devx_uid)
		return -EINVAL;

		dev = to_mdev(c->ibucontext.device);
		pp_entry = kzalloc(sizeof(*pp_entry), GFP_KERNEL);
		if (IS_ERR(pp_entry))
		return PTR_ERR(pp_entry);

		in_ctx = uverbs_attr_get_alloced_ptr(attrs,
		MLX5_IB_ATTR_PP_OBJ_ALLOC_CTX);
		inlen = uverbs_attr_get_len(attrs,
		MLX5_IB_ATTR_PP_OBJ_ALLOC_CTX);
		memcpy(rl_raw, in_ctx, inlen);
		err = uverbs_get_flags32(&flags, attrs,
		MLX5_IB_ATTR_PP_OBJ_ALLOC_FLAGS,
		MLX5_IB_UAPI_PP_ALLOC_FLAGS_DEDICATED_INDEX);
		if (err)
		goto err;

		uid = (flags & MLX5_IB_UAPI_PP_ALLOC_FLAGS_DEDICATED_INDEX) ?
		c->devx_uid : MLX5_SHARED_RESOURCE_UID;

		err = mlx5_rl_add_rate_raw(dev->mdev, rl_raw, uid,
		(flags & MLX5_IB_UAPI_PP_ALLOC_FLAGS_DEDICATED_INDEX),
		&pp_entry->index);
		if (err)
		goto err;

		err = uverbs_copy_to(attrs, MLX5_IB_ATTR_PP_OBJ_ALLOC_INDEX,
		&pp_entry->index, sizeof(pp_entry->index));
		if (err)
		goto clean;

		pp_entry->mdev = dev->mdev;
		uobj->object = pp_entry;
		return 0;

		clean:
		mlx5_rl_remove_rate_raw(dev->mdev, pp_entry->index);
		err:
		kfree(pp_entry);
		return err;
		}

		static int pp_obj_cleanup(struct ib_uobject *uobject,
		enum rdma_remove_reason why,
		struct uverbs_attr_bundle *attrs)
		{
		struct mlx5_ib_pp *pp_entry = uobject->object;

		mlx5_rl_remove_rate_raw(pp_entry->mdev, pp_entry->index);
		kfree(pp_entry);
		return 0;
		}

		DECLARE_UVERBS_NAMED_METHOD(
		MLX5_IB_METHOD_PP_OBJ_ALLOC,
		UVERBS_ATTR_IDR(MLX5_IB_ATTR_PP_OBJ_ALLOC_HANDLE,
		MLX5_IB_OBJECT_PP,
		UVERBS_ACCESS_NEW,
		UA_MANDATORY),
		UVERBS_ATTR_PTR_IN(
		MLX5_IB_ATTR_PP_OBJ_ALLOC_CTX,
		UVERBS_ATTR_SIZE(1,
		MLX5_ST_SZ_BYTES(set_pp_rate_limit_context)),
		UA_MANDATORY,
		UA_ALLOC_AND_COPY),
		UVERBS_ATTR_FLAGS_IN(MLX5_IB_ATTR_PP_OBJ_ALLOC_FLAGS,
		enum mlx5_ib_uapi_pp_alloc_flags,
		UA_MANDATORY),
		UVERBS_ATTR_PTR_OUT(MLX5_IB_ATTR_PP_OBJ_ALLOC_INDEX,
		UVERBS_ATTR_TYPE(u16),
		UA_MANDATORY));

		DECLARE_UVERBS_NAMED_METHOD_DESTROY(
		MLX5_IB_METHOD_PP_OBJ_DESTROY,
		UVERBS_ATTR_IDR(MLX5_IB_ATTR_PP_OBJ_DESTROY_HANDLE,
		MLX5_IB_OBJECT_PP,
		UVERBS_ACCESS_DESTROY,
		UA_MANDATORY));

		DECLARE_UVERBS_NAMED_OBJECT(MLX5_IB_OBJECT_PP,
		UVERBS_TYPE_ALLOC_IDR(pp_obj_cleanup),
		&UVERBS_METHOD(MLX5_IB_METHOD_PP_OBJ_ALLOC),
		&UVERBS_METHOD(MLX5_IB_METHOD_PP_OBJ_DESTROY));


		const struct uapi_definition mlx5_ib_qos_defs[] = {
		UAPI_DEF_CHAIN_OBJ_TREE_NAMED(
		MLX5_IB_OBJECT_PP,
		UAPI_DEF_IS_OBJ_SUPPORTED(pp_is_supported)),
		{},
		};

drivers/net/ethernet/mellanox/mlx5/core/en.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -204,7 +204,7 @@ struct mlx5e_tx_wqe {

		struct mlx5e_rx_wqe_ll {
		struct mlx5_wqe_srq_next_seg next;
		struct mlx5_wqe_data_seg data[0];
		struct mlx5_wqe_data_seg data[];
		};

		struct mlx5e_rx_wqe_cyc {

Admin message