From patchwork Tue Aug 1 12:09:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?N=C3=A9lio_Laranjeiro?= X-Patchwork-Id: 27309 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 12560A0B4; Tue, 1 Aug 2017 14:09:58 +0200 (CEST) Received: from mail-wm0-f53.google.com (mail-wm0-f53.google.com [74.125.82.53]) by dpdk.org (Postfix) with ESMTP id AAF5A9B51 for ; Tue, 1 Aug 2017 14:09:52 +0200 (CEST) Received: by mail-wm0-f53.google.com with SMTP id t201so12875374wmt.0 for ; Tue, 01 Aug 2017 05:09:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=LXAi62Zx6kDOsU56mHdAkxqcDy2LGWu634LEJVi2qLQ=; b=icYiFCPA2L+8wDAKl6uEWvzeXd2m+Jky3kkyFuoj3Edhm0cZ3qpQLU0W89bLLob5nO k4gLwUM1oLjalUZUYN/PL70NF/GPXnyBDokvxs3IaAKeF53ejJjzEj1saOrHsaKAhESH p1uGvw/RWpx3D/rnfFmxjBUqT/6cLVMJM5gj8LqWeekLFYknRqHZucD69Fo0qNGQtIS/ UR4yP8lbQy0EPBvB8nRvLTEz7AxX0ItbWrOHvHgHaJPjn2r4X+/XssN8XB90bov6A0th dg6E1Cx3wjPjbMCwTGfs5qd7nuREzpquyjG6ZzNxXqBYuWkZhhLbBnjL5n1MG3fkkIkW OXiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=LXAi62Zx6kDOsU56mHdAkxqcDy2LGWu634LEJVi2qLQ=; b=XBgE11Z72MhxYVNMqLeQ6K5BndS5RR7z+FOh9kz6umX2g/0BesOXuSPjOSy9pLXnFp sylseE+sQy4v2F0MnZYDCtkvbSm0dpDTGfCsOuREAvkzWASTbWeYvRLKFUb6P77aH0KQ NIH0zV4HOFDrs7B5CPfl9TAb6PdswUr3p0DseXpCzYWBEyADscp/Ho5K0ApqPJcSJdeu cn/FBnUWPJ1xp+4sRVQTbail4Yh2aI5WM5vZfdc/lLJR/N+mvoKi5NtWbO6A1tLgxSF6 SnZG2KF3hpUdK2ZJXme6zGWIXgV0e5zV07DjY5IdilFmHPDAj2fm/aJzNfxsiItKFuZZ Qq5w== X-Gm-Message-State: AIVw113TYKvc7y41UknPOYg1E6FO7RUKoJpRyUpGO/jGPEgSB3UDCozg L3Zqg9bwmaroIiHd X-Received: by 10.28.52.142 with SMTP id b136mr1370924wma.48.1501589392337; Tue, 01 Aug 2017 05:09:52 -0700 (PDT) Received: from ping.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id a3sm34318755wra.17.2017.08.01.05.09.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 01 Aug 2017 05:09:51 -0700 (PDT) From: Nelio Laranjeiro To: Adrien Mazarguil , dev@dpdk.org Cc: Shahaf Shuler Date: Tue, 1 Aug 2017 14:09:30 +0200 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH 4/5] net/mlx5: remove multiple drop RSS queues X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Since MLNX_OFED 4.1 this code is no more useful. Signed-off-by: Nelio Laranjeiro Acked-by: Shahaf Shuler --- drivers/net/mlx5/Makefile | 5 ---- drivers/net/mlx5/mlx5_flow.c | 55 ++++++++++++++------------------------------ 2 files changed, 17 insertions(+), 43 deletions(-) diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile index 8736de5..14b739a 100644 --- a/drivers/net/mlx5/Makefile +++ b/drivers/net/mlx5/Makefile @@ -104,11 +104,6 @@ mlx5_autoconf.h.new: FORCE mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh $Q $(RM) -f -- '$@' $Q sh -- '$<' '$@' \ - HAVE_VERBS_IBV_EXP_FLOW_SPEC_ACTION_DROP \ - infiniband/verbs_exp.h \ - enum IBV_EXP_FLOW_SPEC_ACTION_DROP \ - $(AUTOCONF_OUTPUT) - $Q sh -- '$<' '$@' \ HAVE_VERBS_IBV_EXP_CQ_COMPRESSED_CQE \ infiniband/verbs_exp.h \ enum IBV_EXP_CQ_COMPRESSED_CQE \ diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index d62ccff..7dd3ebb 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -52,13 +52,6 @@ #include "mlx5.h" #include "mlx5_prm.h" -/* Number of Work Queue necessary for the DROP queue. */ -#ifndef HAVE_VERBS_IBV_EXP_FLOW_SPEC_ACTION_DROP -#define MLX5_DROP_WQ_N 4 -#else -#define MLX5_DROP_WQ_N 1 -#endif - static int mlx5_flow_create_eth(const struct rte_flow_item *item, const void *default_mask, @@ -290,7 +283,7 @@ struct mlx5_flow { struct rte_flow_drop { struct ibv_exp_rwq_ind_table *ind_table; /**< Indirection table. */ struct ibv_qp *qp; /**< Verbs queue pair. */ - struct ibv_exp_wq *wqs[MLX5_DROP_WQ_N]; /**< Verbs work queue. */ + struct ibv_exp_wq *wq; /**< Verbs work queue. */ struct ibv_cq *cq; /**< Verbs completion queue. */ }; @@ -580,10 +573,8 @@ priv_flow_validate(struct priv *priv, } if (action->mark && !flow->ibv_attr && !action->drop) flow->offset += sizeof(struct ibv_exp_flow_spec_action_tag); -#ifdef HAVE_VERBS_IBV_EXP_FLOW_SPEC_ACTION_DROP if (!flow->ibv_attr && action->drop) flow->offset += sizeof(struct ibv_exp_flow_spec_action_drop); -#endif if (!action->queue && !action->drop) { rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_HANDLE, NULL, "no valid action"); @@ -1001,10 +992,8 @@ priv_flow_create_action_queue_drop(struct priv *priv, struct rte_flow_error *error) { struct rte_flow *rte_flow; -#ifdef HAVE_VERBS_IBV_EXP_FLOW_SPEC_ACTION_DROP struct ibv_exp_flow_spec_action_drop *drop; unsigned int size = sizeof(struct ibv_exp_flow_spec_action_drop); -#endif assert(priv->pd); assert(priv->ctx); @@ -1015,7 +1004,6 @@ priv_flow_create_action_queue_drop(struct priv *priv, return NULL; } rte_flow->drop = 1; -#ifdef HAVE_VERBS_IBV_EXP_FLOW_SPEC_ACTION_DROP drop = (void *)((uintptr_t)flow->ibv_attr + flow->offset); *drop = (struct ibv_exp_flow_spec_action_drop){ .type = IBV_EXP_FLOW_SPEC_ACTION_DROP, @@ -1023,7 +1011,6 @@ priv_flow_create_action_queue_drop(struct priv *priv, }; ++flow->ibv_attr->num_of_specs; flow->offset += sizeof(struct ibv_exp_flow_spec_action_drop); -#endif rte_flow->ibv_attr = flow->ibv_attr; if (!priv->started) return rte_flow; @@ -1386,7 +1373,6 @@ static int priv_flow_create_drop_queue(struct priv *priv) { struct rte_flow_drop *fdq = NULL; - unsigned int i; assert(priv->pd); assert(priv->ctx); @@ -1403,25 +1389,23 @@ priv_flow_create_drop_queue(struct priv *priv) WARN("cannot allocate CQ for drop queue"); goto error; } - for (i = 0; i != MLX5_DROP_WQ_N; ++i) { - fdq->wqs[i] = ibv_exp_create_wq(priv->ctx, - &(struct ibv_exp_wq_init_attr){ - .wq_type = IBV_EXP_WQT_RQ, - .max_recv_wr = 1, - .max_recv_sge = 1, - .pd = priv->pd, - .cq = fdq->cq, - }); - if (!fdq->wqs[i]) { - WARN("cannot allocate WQ for drop queue"); - goto error; - } + fdq->wq = ibv_exp_create_wq(priv->ctx, + &(struct ibv_exp_wq_init_attr){ + .wq_type = IBV_EXP_WQT_RQ, + .max_recv_wr = 1, + .max_recv_sge = 1, + .pd = priv->pd, + .cq = fdq->cq, + }); + if (!fdq->wq) { + WARN("cannot allocate WQ for drop queue"); + goto error; } fdq->ind_table = ibv_exp_create_rwq_ind_table(priv->ctx, &(struct ibv_exp_rwq_ind_table_init_attr){ .pd = priv->pd, .log_ind_tbl_size = 0, - .ind_tbl = fdq->wqs, + .ind_tbl = &fdq->wq, .comp_mask = 0, }); if (!fdq->ind_table) { @@ -1457,10 +1441,8 @@ priv_flow_create_drop_queue(struct priv *priv) claim_zero(ibv_destroy_qp(fdq->qp)); if (fdq->ind_table) claim_zero(ibv_exp_destroy_rwq_ind_table(fdq->ind_table)); - for (i = 0; i != MLX5_DROP_WQ_N; ++i) { - if (fdq->wqs[i]) - claim_zero(ibv_exp_destroy_wq(fdq->wqs[i])); - } + if (fdq->wq) + claim_zero(ibv_exp_destroy_wq(fdq->wq)); if (fdq->cq) claim_zero(ibv_destroy_cq(fdq->cq)); if (fdq) @@ -1479,7 +1461,6 @@ static void priv_flow_delete_drop_queue(struct priv *priv) { struct rte_flow_drop *fdq = priv->flow_drop_queue; - unsigned int i; if (!fdq) return; @@ -1487,10 +1468,8 @@ priv_flow_delete_drop_queue(struct priv *priv) claim_zero(ibv_destroy_qp(fdq->qp)); if (fdq->ind_table) claim_zero(ibv_exp_destroy_rwq_ind_table(fdq->ind_table)); - for (i = 0; i != MLX5_DROP_WQ_N; ++i) { - if (fdq->wqs[i]) - claim_zero(ibv_exp_destroy_wq(fdq->wqs[i])); - } + if (fdq->wq) + claim_zero(ibv_exp_destroy_wq(fdq->wq)); if (fdq->cq) claim_zero(ibv_destroy_cq(fdq->cq)); rte_free(fdq);