From patchwork Tue Aug 1 16:53:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrien Mazarguil X-Patchwork-Id: 27321 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 9FFC0A0F0; Tue, 1 Aug 2017 18:55:17 +0200 (CEST) Received: from mail-wm0-f54.google.com (mail-wm0-f54.google.com [74.125.82.54]) by dpdk.org (Postfix) with ESMTP id 30BDE9B93 for ; Tue, 1 Aug 2017 18:55:02 +0200 (CEST) Received: by mail-wm0-f54.google.com with SMTP id t138so34935205wmt.1 for ; Tue, 01 Aug 2017 09:55:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=QlRnwehP8sbYYbrwZODZ6RITawam+Vl3knz+KxNuAWA=; b=tpn6uR0n4yV8mjSAWjYfNjDUpdyTyOYaKM1Gf7llWokT6xlOwOkSRJQnaSu1FKXXND N8ezG22jdC/cftDN+PjacaJ/h/BR+P1Tjew/Bncm4ly/NxIcBJZFkcK1tBQpKDDOTOso fclSgeGQqK2UonrCRLkbKo2TffKJMjL9rRy9LFaiP7mgJFhLvVVALNiIpl5ySLSRa+Ii pAB7AlYaU7lgHUH1UO1DosW59U8t9EsOZwbOAfq2tHhGEO87WZBiAZIED8IIhTi8TcfF 2s5X9fsoi1PGtKXNSrbFAsKwfxb9ahE2mxB23uanq31cxSErn4hnKrULQq4Bhg4/IBJW B5SA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=QlRnwehP8sbYYbrwZODZ6RITawam+Vl3knz+KxNuAWA=; b=tfmc1wk6Yez6hjxLzJJnPH4DC3I8fpZS5jS3zZ83KWsugkVPkQ4My6NawnFZ1RjnZw 2rVSBIrj2NQN1uN+WxHh1tQc1nxQOy5fefCwqil0sQ8zX63FJfiyuJR5Qk0AEstDjIAP qFbYPzpgRK8S8Jt56Pf7jOwRQ4YnHzYpy32vHWkRPhZdWGyXAVHElAqkJB63uBj8b4a2 VkqzAlSeWfOhAcsyN20T8TE2QkRv+3jK4F0JMaVH9vsr/sSRGRaSjczjA47bi3SUAhe/ 2LvJ21H8gwy0y04vuKk4h1b+XYgbj/rSHz4lKi+Hv/zN8pqf3J30OD8nVoL55mN05EXD 07yg== X-Gm-Message-State: AIVw110B9dXYc/LOCKfZOvPwGPjNm/MTQBrgs/houbYPG1h88nKUT13Q hh/TyInHm5ZIDLgTAfQ= X-Received: by 10.28.98.137 with SMTP id w131mr1823589wmb.158.1501606502410; Tue, 01 Aug 2017 09:55:02 -0700 (PDT) Received: from 6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id 90sm29602058wrk.38.2017.08.01.09.55.01 for (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 01 Aug 2017 09:55:01 -0700 (PDT) From: Adrien Mazarguil To: dev@dpdk.org Date: Tue, 1 Aug 2017 18:53:56 +0200 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: Subject: [dpdk-dev] [PATCH v1 09/48] net/mlx4: remove Tx inline compilation option 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" This should be a run-time parameter. Signed-off-by: Adrien Mazarguil --- config/common_base | 1 - drivers/net/mlx4/Makefile | 4 ---- drivers/net/mlx4/mlx4.c | 6 ------ drivers/net/mlx4/mlx4.h | 4 ---- 4 files changed, 15 deletions(-) diff --git a/config/common_base b/config/common_base index 2520bd1..b6e322c 100644 --- a/config/common_base +++ b/config/common_base @@ -213,7 +213,6 @@ CONFIG_RTE_LIBRTE_FM10K_INC_VECTOR=y # CONFIG_RTE_LIBRTE_MLX4_PMD=n CONFIG_RTE_LIBRTE_MLX4_DEBUG=n -CONFIG_RTE_LIBRTE_MLX4_MAX_INLINE=0 CONFIG_RTE_LIBRTE_MLX4_TX_MP_CACHE=8 # diff --git a/drivers/net/mlx4/Makefile b/drivers/net/mlx4/Makefile index a9c44ca..8406ba2 100644 --- a/drivers/net/mlx4/Makefile +++ b/drivers/net/mlx4/Makefile @@ -68,10 +68,6 @@ else CFLAGS += -DNDEBUG -UPEDANTIC endif -ifdef CONFIG_RTE_LIBRTE_MLX4_MAX_INLINE -CFLAGS += -DMLX4_PMD_MAX_INLINE=$(CONFIG_RTE_LIBRTE_MLX4_MAX_INLINE) -endif - ifdef CONFIG_RTE_LIBRTE_MLX4_TX_MP_CACHE CFLAGS += -DMLX4_PMD_TX_MP_CACHE=$(CONFIG_RTE_LIBRTE_MLX4_TX_MP_CACHE) endif diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index 6dd0863..d00ddc6 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -1428,7 +1428,6 @@ mlx4_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) (uintptr_t)addr); RTE_MBUF_PREFETCH_TO_FREE(elt_next->buf); /* Put packet into send queue. */ -#if MLX4_PMD_MAX_INLINE > 0 if (length <= txq->max_inline) err = txq->if_qp->send_pending_inline (txq->qp, @@ -1436,7 +1435,6 @@ mlx4_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) length, send_flags); else -#endif err = txq->if_qp->send_pending (txq->qp, addr, @@ -1578,9 +1576,7 @@ txq_setup(struct rte_eth_dev *dev, struct txq *txq, uint16_t desc, MLX4_PMD_SGE_WR_N) ? priv->device_attr.max_sge : MLX4_PMD_SGE_WR_N), -#if MLX4_PMD_MAX_INLINE > 0 .max_inline_data = MLX4_PMD_MAX_INLINE, -#endif }, .qp_type = IBV_QPT_RAW_PACKET, /* Do *NOT* enable this, completions events are managed per @@ -1598,10 +1594,8 @@ txq_setup(struct rte_eth_dev *dev, struct txq *txq, uint16_t desc, (void *)dev, strerror(ret)); goto error; } -#if MLX4_PMD_MAX_INLINE > 0 /* ibv_create_qp() updates this value. */ tmpl.max_inline = attr.init.cap.max_inline_data; -#endif attr.mod = (struct ibv_exp_qp_attr){ /* Move the QP to this state. */ .qp_state = IBV_QPS_INIT, diff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h index 785b2ac..469ab4b 100644 --- a/drivers/net/mlx4/mlx4.h +++ b/drivers/net/mlx4/mlx4.h @@ -84,9 +84,7 @@ #define MLX4_PMD_SGE_WR_N 4 /* Maximum size for inline data. */ -#ifndef MLX4_PMD_MAX_INLINE #define MLX4_PMD_MAX_INLINE 0 -#endif /* * Maximum number of cached Memory Pools (MPs) per TX queue. Each RTE MP @@ -261,9 +259,7 @@ struct txq { struct ibv_qp *qp; /* Queue Pair. */ struct ibv_exp_qp_burst_family *if_qp; /* QP burst interface. */ struct ibv_exp_cq_family *if_cq; /* CQ interface. */ -#if MLX4_PMD_MAX_INLINE > 0 uint32_t max_inline; /* Max inline send size <= MLX4_PMD_MAX_INLINE. */ -#endif unsigned int elts_n; /* (*elts)[] length. */ struct txq_elt (*elts)[]; /* TX elements. */ unsigned int elts_head; /* Current index in (*elts)[]. */