Commit 3c739d16 authored by Yevgeny Kliteynik's avatar Yevgeny Kliteynik Committed by Jakub Kicinski
Browse files

net/mlx5: HWS, expose polling function in header file 



In preparation for complex matcher, expose the function that is
polling queue for completion (mlx5hws_bwc_queue_poll) in header
file, so that it will be used by complex matcher code.

Signed-off-by: default avatarYevgeny Kliteynik <kliteyn@nvidia.com>
Reviewed-by: default avatarVlad Dogaru <vdogaru@nvidia.com>
Reviewed-by: default avatarMark Bloch <mbloch@nvidia.com>
Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Link: https://patch.msgid.link/1746992290-568936-4-git-send-email-tariqt@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent fed5f483

drivers/net/ethernet/mellanox/mlx5/core/steering/hws/bwc.c

+16 −13
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ int mlx5hws_bwc_matcher_destroy(struct mlx5hws_bwc_matcher *bwc_matcher) 
	return 0;

}



static int hws_bwc_queue_poll(struct mlx5hws_context *ctx,

int mlx5hws_bwc_queue_poll(struct mlx5hws_context *ctx,

			   u16 queue_id,

			   u32 *pending_rules,

			   bool drain)
@@ -361,7 +361,8 @@ hws_bwc_rule_destroy_hws_sync(struct mlx5hws_bwc_rule *bwc_rule, 
	if (unlikely(ret))

		return ret;



	ret = hws_bwc_queue_poll(ctx, rule_attr->queue_id, &expected_completions, true);

	ret = mlx5hws_bwc_queue_poll(ctx, rule_attr->queue_id,

				     &expected_completions, true);

	if (unlikely(ret))

		return ret;
@@ -442,9 +443,8 @@ hws_bwc_rule_create_sync(struct mlx5hws_bwc_rule *bwc_rule, 
	if (unlikely(ret))

		return ret;



	ret = hws_bwc_queue_poll(ctx, rule_attr->queue_id, &expected_completions, true);



	return ret;

	return mlx5hws_bwc_queue_poll(ctx, rule_attr->queue_id,

				      &expected_completions, true);

}



static int
@@ -465,7 +465,8 @@ hws_bwc_rule_update_sync(struct mlx5hws_bwc_rule *bwc_rule, 
	if (unlikely(ret))

		return ret;



	ret = hws_bwc_queue_poll(ctx, rule_attr->queue_id, &expected_completions, true);

	ret = mlx5hws_bwc_queue_poll(ctx, rule_attr->queue_id,

				     &expected_completions, true);

	if (unlikely(ret))

		mlx5hws_err(ctx, "Failed updating BWC rule (%d)\n", ret);
@@ -651,8 +652,10 @@ static int hws_bwc_matcher_move_all_simple(struct mlx5hws_bwc_matcher *bwc_match 
							    &bwc_matcher->rules[i]) ?

					       NULL : list_next_entry(bwc_rules[i], list_node);



				ret = hws_bwc_queue_poll(ctx, rule_attr.queue_id,

							 &pending_rules[i], false);

				ret = mlx5hws_bwc_queue_poll(ctx,

							     rule_attr.queue_id,

							     &pending_rules[i],

							     false);

				if (unlikely(ret)) {

					mlx5hws_err(ctx,

						    "Moving BWC rule failed during rehash (%d)\n",
@@ -669,7 +672,7 @@ static int hws_bwc_matcher_move_all_simple(struct mlx5hws_bwc_matcher *bwc_match 
			u16 queue_id = mlx5hws_bwc_get_queue_id(ctx, i);



			mlx5hws_send_engine_flush_queue(&ctx->send_queue[queue_id]);

			ret = hws_bwc_queue_poll(ctx, queue_id,

			ret = mlx5hws_bwc_queue_poll(ctx, queue_id,

						     &pending_rules[i], true);

			if (unlikely(ret)) {

				mlx5hws_err(ctx,

drivers/net/ethernet/mellanox/mlx5/core/steering/hws/bwc.h

+5 −0
Original line number Diff line number Diff line
@@ -64,6 +64,11 @@ void mlx5hws_bwc_rule_fill_attr(struct mlx5hws_bwc_matcher *bwc_matcher, 
				u32 flow_source,

				struct mlx5hws_rule_attr *rule_attr);



int mlx5hws_bwc_queue_poll(struct mlx5hws_context *ctx,

			   u16 queue_id,

			   u32 *pending_rules,

			   bool drain);



static inline u16 mlx5hws_bwc_queues(struct mlx5hws_context *ctx)

{

	/* Besides the control queue, half of the queues are