From patchwork Fri Sep 1 08:06:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrien Mazarguil X-Patchwork-Id: 28207 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 0F2427D2A; Fri, 1 Sep 2017 10:07:38 +0200 (CEST) Received: from mail-wm0-f51.google.com (mail-wm0-f51.google.com [74.125.82.51]) by dpdk.org (Postfix) with ESMTP id 24C757D0A for ; Fri, 1 Sep 2017 10:07:35 +0200 (CEST) Received: by mail-wm0-f51.google.com with SMTP id f127so3659557wmf.1 for ; Fri, 01 Sep 2017 01:07:35 -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=IcmGZVNG4V1Xu9wLKnx71De4PWz8HaDeiCu+jxWDlHA=; b=LiWNhoi8hPNa3D990qCBCWiJI1CrbREJGEi2aUb4zW8PVNQAu8brGHL668IIZ/Iicm 3xtKmwVoh3GDWn/jZdS8C57FCj17oyoxRkURdOl0+b8PAl7LsCiVNMZg85rpBuV+swmy Zzwd4QnHflioFs8UH8hMrkAfnlloSbF0NzEXWN4WdxOXCM8SjcDwiB92PhNKduj6cbqj ajIoycV3awtD8D3tFr+VEHxc/4Fi7Ih7liwgnX73C1Y+ddOemlfh58uSlARNyRdHnoUI EJLB7iOlLDFmEbY/U2Udj5zW1r1b7oU1BssaDJeyoGfm3MPsJBCtp0C/Lj6pR75v3Voo xq8Q== 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=IcmGZVNG4V1Xu9wLKnx71De4PWz8HaDeiCu+jxWDlHA=; b=IfSp8Wn7T8dofIepepfJNHOIfy7yGJ9csljv9hXNwxiyGAGDtgT71/UFax6+94IGF1 d1ZNp48tgxcSJo5EenFNXCmpREEIXyo7gkn9gUhFSKEIpaQIilCbF/qbR/0lGYm9Askf MncuNM0ZIxRBuyeh3ldGgpPNOBtGWPfl5uQ6ZTAXSCAlCd1rDj9r+UGqt1eNP3v8/HcN BA0wto6rCKbZ2K8HeY0ELI9doulannxFUnO+ouI4LFwtUgs0/mjF72KOvnX89iY+UT0R EGH74vJQisJsAL6KosTsrO8TTJwsDYIDXkA5jIqA3W+lT7fCDPO1zJLP0emUWFS61wtl LouA== X-Gm-Message-State: AHPjjUiXTQQDgdV/7zy+4guV5om/rQFH078fYzIYjp7RfM3/x424r1sa yy/DZGk9/WUPDTs2Tdw= X-Google-Smtp-Source: ADKCNb5xNEj1vODPC03ssFfLDjKQACepzYWQvu0WlinQ2Qsldc+cM92ItuNCepyJVrsTffN7FrjQfQ== X-Received: by 10.28.29.79 with SMTP id d76mr508354wmd.106.1504253254618; Fri, 01 Sep 2017 01:07:34 -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 o206sm1335584wmo.10.2017.09.01.01.07.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Sep 2017 01:07:33 -0700 (PDT) From: Adrien Mazarguil To: dev@dpdk.org Date: Fri, 1 Sep 2017 10:06:23 +0200 Message-Id: <2a3841a5a303c9a37226b24985bafd4f2c4e2f9e.1504252977.git.adrien.mazarguil@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: Subject: [dpdk-dev] [PATCH v2 08/51] net/mlx4: remove scatter mode 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 option both sets the maximum number of segments for Rx/Tx packets and whether scattered mode is supported at all. This commit removes the latter as well as configuration file exposure since the most appropriate value should be decided at run-time. Signed-off-by: Adrien Mazarguil --- config/common_base | 1 - doc/guides/nics/mlx4.rst | 7 ------- drivers/net/mlx4/Makefile | 4 ---- drivers/net/mlx4/mlx4.c | 10 ---------- drivers/net/mlx4/mlx4.h | 2 -- 5 files changed, 24 deletions(-) diff --git a/config/common_base b/config/common_base index c7ffb6b..f966fd1 100644 --- a/config/common_base +++ b/config/common_base @@ -214,7 +214,6 @@ CONFIG_RTE_LIBRTE_FM10K_INC_VECTOR=y CONFIG_RTE_LIBRTE_MLX4_PMD=n CONFIG_RTE_LIBRTE_MLX4_DEBUG=n CONFIG_RTE_LIBRTE_MLX4_DEBUG_BROKEN_VERBS=n -CONFIG_RTE_LIBRTE_MLX4_SGE_WR_N=4 CONFIG_RTE_LIBRTE_MLX4_MAX_INLINE=0 CONFIG_RTE_LIBRTE_MLX4_TX_MP_CACHE=8 diff --git a/doc/guides/nics/mlx4.rst b/doc/guides/nics/mlx4.rst index eba81ba..8c656d3 100644 --- a/doc/guides/nics/mlx4.rst +++ b/doc/guides/nics/mlx4.rst @@ -124,13 +124,6 @@ These options can be modified in the ``.config`` file. to abort with harmless debugging messages as a workaround. Relevant only when CONFIG_RTE_LIBRTE_MLX4_DEBUG is enabled. -- ``CONFIG_RTE_LIBRTE_MLX4_SGE_WR_N`` (default **4**) - - Number of scatter/gather elements (SGEs) per work request (WR). Lowering - this number improves performance but also limits the ability to receive - scattered packets (packets that do not fit a single mbuf). The default - value is a safe tradeoff. - - ``CONFIG_RTE_LIBRTE_MLX4_MAX_INLINE`` (default **0**) Amount of data to be inlined during TX operations. Improves latency but diff --git a/drivers/net/mlx4/Makefile b/drivers/net/mlx4/Makefile index 147e541..f9257fc 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_SGE_WR_N -CFLAGS += -DMLX4_PMD_SGE_WR_N=$(CONFIG_RTE_LIBRTE_MLX4_SGE_WR_N) -endif - ifdef CONFIG_RTE_LIBRTE_MLX4_MAX_INLINE CFLAGS += -DMLX4_PMD_MAX_INLINE=$(CONFIG_RTE_LIBRTE_MLX4_MAX_INLINE) endif diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index 2e8de92..0bbcb7b 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -1176,8 +1176,6 @@ txq_mp2mr_iter(struct rte_mempool *mp, void *arg) txq_mp2mr(txq, mp); } -#if MLX4_PMD_SGE_WR_N > 1 - /** * Copy scattered mbuf contents to a single linear buffer. * @@ -1324,8 +1322,6 @@ tx_burst_sg(struct txq *txq, unsigned int segs, struct txq_elt *elt, }; } -#endif /* MLX4_PMD_SGE_WR_N > 1 */ - /** * DPDK callback for TX. * @@ -1451,7 +1447,6 @@ mlx4_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) goto stop; sent_size += length; } else { -#if MLX4_PMD_SGE_WR_N > 1 struct ibv_sge sges[MLX4_PMD_SGE_WR_N]; struct tx_burst_sg_ret ret; @@ -1469,11 +1464,6 @@ mlx4_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) if (unlikely(err)) goto stop; sent_size += ret.length; -#else /* MLX4_PMD_SGE_WR_N > 1 */ - DEBUG("%p: TX scattered buffers support not" - " compiled in", (void *)txq); - goto stop; -#endif /* MLX4_PMD_SGE_WR_N > 1 */ } elts_head = elts_head_next; /* Increment sent bytes counter. */ diff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h index 97e042e..5c2005d 100644 --- a/drivers/net/mlx4/mlx4.h +++ b/drivers/net/mlx4/mlx4.h @@ -81,9 +81,7 @@ #define MLX4_PMD_TX_PER_COMP_REQ 64 /* Maximum number of Scatter/Gather Elements per Work Request. */ -#ifndef MLX4_PMD_SGE_WR_N #define MLX4_PMD_SGE_WR_N 4 -#endif /* Maximum size for inline data. */ #ifndef MLX4_PMD_MAX_INLINE