From patchwork Fri Sep 1 08:06:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrien Mazarguil X-Patchwork-Id: 28208 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 141817D36; Fri, 1 Sep 2017 10:07:39 +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 DD3CB7D1C for ; Fri, 1 Sep 2017 10:07:36 +0200 (CEST) Received: by mail-wm0-f54.google.com with SMTP id f127so3659990wmf.1 for ; Fri, 01 Sep 2017 01:07:36 -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=FvABDaLEGZwq6aiyD0tavQpZO9pSD6j2Ni74wOAkhDk=; b=R46r7Arjmxp+ZVaJxIE5SncZm5zr1Fb6dVVzkrPSpFpe4AAjZbTH5/G2k8RIYQt+qP /Nwo/9s6mnmVB8MDeXsigGHNiXJaOzPpNO4u+Nxw0ql0xYjjHf8p3JcFBr/ZbvO3HP9m KAmTGcuh5jLBGvKaPYpSTChm0FR875G4zCzfnf5z7O+Cb5s3sTZolts66fpegRgzlOuk /EgbXdwbXZwaap8Y0ox5nILqgYaQCYrwo5ldPamVzdrR96Dot8xnMj1orCTs8V1sqQAU M625Hl04dnd6xg85J1YHq+WrJZHjJcDRBZ6sfbIpmYDRgHLZypkdybiFokb/ZLDovPld jNBA== 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=FvABDaLEGZwq6aiyD0tavQpZO9pSD6j2Ni74wOAkhDk=; b=A3EynTpo6k8zesjk5H/fYpoLNixIO1cEl+CztZ27E9Icmb4jcM8DUh4PYZS+zPg1CI yoED664lLoFhjjPQLne1vdIfHCa8McwGa626bhq1A9ItJDPGoh8z2vmWJPM9mvBiZoRX 4/iM7bbVqpqHPJeqGjStzzeqXFb+NRTCEHLo4p1lLgMV85LsF61dzwVvkRf03Q+IxQFm 4QVE8tIn2yp3X4xamHhjM3gHKwu6HEE+OFKdjjru+LDt+28grFnay3BqLQJcCmqQ5Fia WkYu2KV1YSJsRFzNYpPs3Qr40E4nOqm9NN2lDkz6J68+ZGeDd6rpegFsEREnVFyglShU Og0Q== X-Gm-Message-State: AHPjjUijxcO/0uQqa4TGyLQQy/q5+lgHfCzqlo+5xB5twzD3l0F/2n/Z NhmrVJtAjrREYyb63qE= X-Google-Smtp-Source: ADKCNb5N+refKnE+oScbML1ThSxPaOWbkM8xLqd3y+WgxMpKUcrdw6jbK5RtS53idu5T2KANej4rFw== X-Received: by 10.28.103.84 with SMTP id b81mr512770wmc.22.1504253255851; Fri, 01 Sep 2017 01:07:35 -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 u68sm1266166wmu.40.2017.09.01.01.07.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Sep 2017 01:07:34 -0700 (PDT) From: Adrien Mazarguil To: dev@dpdk.org Date: Fri, 1 Sep 2017 10:06:24 +0200 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: Subject: [dpdk-dev] [PATCH v2 09/51] 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 f966fd1..edc563a 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_MAX_INLINE=0 CONFIG_RTE_LIBRTE_MLX4_TX_MP_CACHE=8 # diff --git a/drivers/net/mlx4/Makefile b/drivers/net/mlx4/Makefile index f9257fc..bd713e2 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 0bbcb7b..394b87c 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 5c2005d..256e644 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 @@ -267,9 +265,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)[]. */