From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <nelio.laranjeiro@6wind.com>
Received: from mail-wm0-f48.google.com (mail-wm0-f48.google.com [74.125.82.48])
by dpdk.org (Postfix) with ESMTP id 22BB7C6B6
for <dev@dpdk.org>; Fri, 24 Jun 2016 15:18:59 +0200 (CEST)
Received: by mail-wm0-f48.google.com with SMTP id a66so25261131wme.0
for <dev@dpdk.org>; Fri, 24 Jun 2016 06:18:59 -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;
bh=BAdxyxgzRN87PZfgfU6YP23EP3gsDTUCq8o7m1sDzGY=;
b=KRvs9k5k/ZL47l4JitV/MmLtQWsXaBK4sh/i56jA6tlSY2wMuSe78SCDzKfM41Pg7g
16V9A5mGdv6QgcscSAsxIV1R17wUCIapam/pqNlEb9vo2VaT+QbOPy7iCwkD5Y/D0sd0
POCeegRmlnke3DWPjzrzvd8/Hewz1ZpB/9ModH0XMrSINr3LaPlJNv5Y+0Hdm5aeTvba
Fq6PSseKR777U//J1E+XjmU+R5OT6UeBovFVbvpTywlxVSaEAQdoC0/4zIEb15CR4z6p
zcffc2KRwryhBJ9WMpFgYleplj7SJZqsaJ9VXGX1wB5ezkiB3TcH59VhD3TBvDjdzBBJ
uR1Q==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20130820;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references;
bh=BAdxyxgzRN87PZfgfU6YP23EP3gsDTUCq8o7m1sDzGY=;
b=d2V0jOkxacyGFec+vHyqjAyAqTMG+B/dJBWkZOH7WMGlEWr7dfAFNhhy9RQdHDa0oJ
+W/2lcLDhhLrbWu8HGdlQ7bkcbwGf1HfPw8eGnGNZbzcfQmu92kTqTfVP6gPNrFqusA3
SCfomnooOPS1m5TAD/2rG6haCuRBxOJ6zL11IXrzEvPhRa2wTjcO29jrHeHk7318+BUQ
gTI6m1prSkLzPrC2BU2U/AYuBuh7XvvkoGISfEnOjxLyq9QpZdl6R3I5CvfEEGrxOayb
zEXwEX66vNlRJ1uDgBHwJzz6DSasWesejOD2u5fdmy1DW74BTIdU/evqPHnkXDp0dEv0
KW+Q==
X-Gm-Message-State: ALyK8tIG642mzMpn0M//spi4OVbMfkTIIf8Y2GneRFJT0Dy54dzHY5zuFegWmy3roBkdvFTG
X-Received: by 10.28.71.74 with SMTP id u71mr6401799wma.0.1466774338795;
Fri, 24 Jun 2016 06:18:58 -0700 (PDT)
Received: from ping.vm.6wind.com (guy78-3-82-239-227-177.fbx.proxad.net.
[82.239.227.177])
by smtp.gmail.com with ESMTPSA id m125sm1279533wmm.8.2016.06.24.06.18.57
(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
Fri, 24 Jun 2016 06:18:58 -0700 (PDT)
From: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
To: dev@dpdk.org
Cc: Bruce Richardson <bruce.richardson@intel.com>,
Ferruh Yigit <ferruh.yigit@intel.com>,
Adrien Mazarguil <adrien.mazarguil@6wind.com>
Date: Fri, 24 Jun 2016 15:17:51 +0200
Message-Id: <1466774284-20932-13-git-send-email-nelio.laranjeiro@6wind.com>
X-Mailer: git-send-email 2.1.4
In-Reply-To: <1466774284-20932-1-git-send-email-nelio.laranjeiro@6wind.com>
References: <1466758261-25986-1-git-send-email-nelio.laranjeiro@6wind.com>
<1466774284-20932-1-git-send-email-nelio.laranjeiro@6wind.com>
Subject: [dpdk-dev] [PATCH v7 12/25] mlx5: add Tx/Rx burst function
selection wrapper
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Jun 2016 13:18:59 -0000
These wrappers are meant to prevent code duplication later.
Signed-off-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
Signed-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
---
drivers/net/mlx5/mlx5.h | 2 ++
drivers/net/mlx5/mlx5_ethdev.c | 34 ++++++++++++++++++++++++++++------
drivers/net/mlx5/mlx5_txq.c | 2 +-
3 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 935e1b0..3dca03d 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -196,6 +196,8 @@ void priv_dev_interrupt_handler_install(struct priv *, struct rte_eth_dev *);
int mlx5_set_link_down(struct rte_eth_dev *dev);
int mlx5_set_link_up(struct rte_eth_dev *dev);
struct priv *mlx5_secondary_data_setup(struct priv *priv);
+void priv_select_tx_function(struct priv *);
+void priv_select_rx_function(struct priv *);
/* mlx5_mac.c */
diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
index 4095a06..759434e 100644
--- a/drivers/net/mlx5/mlx5_ethdev.c
+++ b/drivers/net/mlx5/mlx5_ethdev.c
@@ -1099,8 +1099,8 @@ priv_set_link(struct priv *priv, int up)
err = priv_set_flags(priv, ~IFF_UP, IFF_UP);
if (err)
return err;
- dev->rx_pkt_burst = mlx5_rx_burst;
- dev->tx_pkt_burst = mlx5_tx_burst;
+ priv_select_tx_function(priv);
+ priv_select_rx_function(priv);
} else {
err = priv_set_flags(priv, ~IFF_UP, ~IFF_UP);
if (err)
@@ -1290,13 +1290,11 @@ mlx5_secondary_data_setup(struct priv *priv)
rte_mb();
priv->dev->data = &sd->data;
rte_mb();
- priv->dev->tx_pkt_burst = mlx5_tx_burst;
- priv->dev->rx_pkt_burst = removed_rx_burst;
+ priv_select_tx_function(priv);
+ priv_select_rx_function(priv);
priv_unlock(priv);
end:
/* More sanity checks. */
- assert(priv->dev->tx_pkt_burst == mlx5_tx_burst);
- assert(priv->dev->rx_pkt_burst == removed_rx_burst);
assert(priv->dev->data == &sd->data);
rte_spinlock_unlock(&sd->lock);
return priv;
@@ -1307,3 +1305,27 @@ error:
rte_spinlock_unlock(&sd->lock);
return NULL;
}
+
+/**
+ * Configure the TX function to use.
+ *
+ * @param priv
+ * Pointer to private structure.
+ */
+void
+priv_select_tx_function(struct priv *priv)
+{
+ priv->dev->tx_pkt_burst = mlx5_tx_burst;
+}
+
+/**
+ * Configure the RX function to use.
+ *
+ * @param priv
+ * Pointer to private structure.
+ */
+void
+priv_select_rx_function(struct priv *priv)
+{
+ priv->dev->rx_pkt_burst = mlx5_rx_burst;
+}
diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c
index 51210f2..ec4488a 100644
--- a/drivers/net/mlx5/mlx5_txq.c
+++ b/drivers/net/mlx5/mlx5_txq.c
@@ -478,7 +478,7 @@ mlx5_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
(void *)dev, (void *)txq_ctrl);
(*priv->txqs)[idx] = &txq_ctrl->txq;
/* Update send callback. */
- dev->tx_pkt_burst = mlx5_tx_burst;
+ priv_select_tx_function(priv);
}
priv_unlock(priv);
return -ret;
--
2.1.4