From patchwork Thu Nov 23 09:22:36 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: 31525 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 [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9793E2BD0; Thu, 23 Nov 2017 10:23:02 +0100 (CET) Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by dpdk.org (Postfix) with ESMTP id 4F4812A62 for ; Thu, 23 Nov 2017 10:22:58 +0100 (CET) Received: by mail-wm0-f65.google.com with SMTP id 128so15068750wmo.3 for ; Thu, 23 Nov 2017 01:22:58 -0800 (PST) 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=KvR2zu/VsRpKfNYc8K2ERoSjQ5ux9/pEKB/Uz3wjiig=; b=dZUaG9eYeE7rnKNM12aQawLp+nk7fPd8wF4RunoopfBXmxVqVe9ChO01+KP0uLMkCe w5YceneggeLLyUvxAiNRcU6hswTaX0DCiJDs7Ca55lMa+xdZ/WWzdbHJUe6nL2Af+pT7 JGssJOYf0V6V+ob1r/JjSrHfhULkyOPaqyouU2f0UFX6070ZpQensPfjICTzQdp77SPV rBK6ol33Z/D2hVdego5+Y9lWEhISDxPMyAMr86diON+vH/VA6F4mOdwe0OCN2zkSzD4U 4gKYSprTpfm6TQI5kUsuUDqM8OCkiHxo9l4YRgijh7I8m8Isyyjroaz/z+AAFfU+ZM4+ g2/w== 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=KvR2zu/VsRpKfNYc8K2ERoSjQ5ux9/pEKB/Uz3wjiig=; b=ArsE1/NHQT50zHP1VWBtz6fd/47c0wmed87+uv+WFFTZojGntEhxNFmJzAcioy09fM xIjT7NqV0Q7rIVFplsIwzF07I6CfIulhh2a8fuHFmdKxFXNJ0TDj6CVYFbAH+L0jRHbd W8Qk8x7LQdvMADK5Ya4KETe/pL2wy7pu7/c7bAQ8lfBOb7/sUmpyVBpqiI2LGqsOITlC eB4u14sm+o9Ln1flePKTbVc1AejxYdLycj/XqjiNL2OBIG9gWO97qiUBLGkJiTi26lCO MF515bRmS0Gcggx74ElMJLoMHtZFPzZOoG0SMEFM0X5yyWzCWK9FGOSDj24z8kLmh6dq P3SA== X-Gm-Message-State: AJaThX5BgiKIRTB0hAGzXXEOW17Ypzi/bcHLJE/wXq1762XkmcRY6RC0 pEg26XZN/qdvUcefSWQcxO9sZyWlBw== X-Google-Smtp-Source: AGs4zMZUxyvQAZveNF5VLCtjDfPtcevIWF6hbsyoF92F3+7w/gtWERvL5dA/sHZYtlrT5l9c7Gy/qA== X-Received: by 10.80.173.88 with SMTP id z24mr32922126edc.133.1511428977849; Thu, 23 Nov 2017 01:22:57 -0800 (PST) Received: from laranjeiro-vm.dev.6wind.com. (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id o15sm5688343edk.25.2017.11.23.01.22.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Nov 2017 01:22:57 -0800 (PST) From: Nelio Laranjeiro To: dev@dpdk.org Cc: Yongseok Koh , Adrien Mazarguil Date: Thu, 23 Nov 2017 10:22:36 +0100 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH 5/5] net/mlx5: remove redundant inline variable 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" A non max_inline 0 means an inline is requested, there is no need to duplicate this information. Signed-off-by: Nelio Laranjeiro Acked-by: Yongseok Koh --- drivers/net/mlx5/mlx5_rxtx.c | 5 ++--- drivers/net/mlx5/mlx5_rxtx.h | 1 - drivers/net/mlx5/mlx5_txq.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c index d735e646c..28c0ad8ab 100644 --- a/drivers/net/mlx5/mlx5_rxtx.c +++ b/drivers/net/mlx5/mlx5_rxtx.c @@ -348,6 +348,7 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) unsigned int comp; volatile struct mlx5_wqe_ctrl *last_wqe = NULL; unsigned int segs_n = 0; + const unsigned int max_inline = txq->max_inline; if (unlikely(!pkts_n)) return 0; @@ -360,8 +361,6 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) if (unlikely(!max_wqe)) return 0; do { - unsigned int max_inline = txq->max_inline; - const unsigned int inline_en = !!max_inline && txq->inline_en; struct rte_mbuf *buf = NULL; uint8_t *raw; volatile struct mlx5_wqe_v *wqe = NULL; @@ -516,7 +515,7 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) } } /* Inline if enough room. */ - if (inline_en || tso) { + if (max_inline || tso) { uint32_t inl; uintptr_t end = (uintptr_t) (((uintptr_t)txq->wqes) + diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h index 63eb12c66..b8c7925a3 100644 --- a/drivers/net/mlx5/mlx5_rxtx.h +++ b/drivers/net/mlx5/mlx5_rxtx.h @@ -191,7 +191,6 @@ struct mlx5_txq_data { uint16_t elts_n:4; /* (*elts)[] length (in log2). */ uint16_t cqe_n:4; /* Number of CQ elements (in log2). */ uint16_t wqe_n:4; /* Number of of WQ elements (in log2). */ - uint16_t inline_en:1; /* When set inline is enabled. */ uint16_t tso_en:1; /* When set hardware TSO is enabled. */ uint16_t tunnel_en:1; /* When set TX offload for tunneled packets are supported. */ diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c index 84d37be19..a786a6b63 100644 --- a/drivers/net/mlx5/mlx5_txq.c +++ b/drivers/net/mlx5/mlx5_txq.c @@ -353,7 +353,7 @@ mlx5_priv_txq_ibv_new(struct priv *priv, uint16_t idx) .pd = priv->pd, .comp_mask = IBV_QP_INIT_ATTR_PD, }; - if (txq_data->inline_en) + if (txq_data->max_inline) attr.init.cap.max_inline_data = txq_ctrl->max_inline_data; if (txq_data->tso_en) { attr.init.max_tso_header = txq_ctrl->max_tso_header; @@ -589,7 +589,6 @@ mlx5_priv_txq_new(struct priv *priv, uint16_t idx, uint16_t desc, tmpl->txq.max_inline = ((priv->txq_inline + (RTE_CACHE_LINE_SIZE - 1)) / RTE_CACHE_LINE_SIZE); - tmpl->txq.inline_en = 1; /* TSO and MPS can't be enabled concurrently. */ assert(!priv->tso || !priv->mps); if (priv->mps == MLX5_MPW_ENHANCED) {