RDMA/uverbs: Add generic function to fill in flow action object (841eefc5) · Commits · 戴 / test

drivers/infiniband/core/uverbs_std_types_flow_action.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -326,11 +326,8 @@ static int UVERBS_HANDLER(UVERBS_METHOD_FLOW_ACTION_ESP_CREATE)(
		if (IS_ERR(action))
		return PTR_ERR(action);

		atomic_set(&action->usecnt, 0);
		action->device = ib_dev;
		action->type = IB_FLOW_ACTION_ESP;
		action->uobject = uobj;
		uobj->object = action;
		uverbs_flow_action_fill_action(action, uobj, ib_dev,
		IB_FLOW_ACTION_ESP);

		return 0;
		}

+3 −5

Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@
		#include <rdma/ib_verbs.h>
		#include <rdma/uverbs_types.h>
		#include <rdma/uverbs_ioctl.h>
		#include <rdma/uverbs_std_types.h>
		#include <rdma/mlx5_user_ioctl_cmds.h>
		#include <rdma/mlx5_user_ioctl_verbs.h>
		#include <rdma/ib_umem.h>
		@@ -279,11 +280,8 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_FLOW_ACTION_CREATE_MODIFY_HEADER)(
		if (IS_ERR(action))
		return PTR_ERR(action);

		atomic_set(&action->usecnt, 0);
		action->device = uobj->context->device;
		action->type = IB_FLOW_ACTION_UNSPECIFIED;
		action->uobject = uobj;
		uobj->object = action;
		uverbs_flow_action_fill_action(action, uobj, uobj->context->device,
		IB_FLOW_ACTION_UNSPECIFIED);

		return 0;
		}

+12 −0

Original line number	Diff line number	Diff line
		@@ -140,5 +140,17 @@ __uobj_alloc(const struct uverbs_api_object obj, struct ib_uverbs_file ufile,
		#define uobj_alloc(_type, _ufile, _ib_dev) \
		__uobj_alloc(uobj_get_type(_ufile, _type), _ufile, _ib_dev)

		static inline void uverbs_flow_action_fill_action(struct ib_flow_action *action,
		struct ib_uobject *uobj,
		struct ib_device *ib_dev,
		enum ib_flow_action_type type)
		{
		atomic_set(&action->usecnt, 0);
		action->device = ib_dev;
		action->type = type;
		action->uobject = uobj;
		uobj->object = action;
		}

		#endif