From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf0-f53.google.com (mail-lf0-f53.google.com [209.85.215.53]) by dpdk.org (Postfix) with ESMTP id E7E85C13A for ; Wed, 22 Jun 2016 11:06:21 +0200 (CEST) Received: by mail-lf0-f53.google.com with SMTP id h129so67625051lfh.1 for ; Wed, 22 Jun 2016 02:06:21 -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=Zf/b62rCWOQGdkGqxa4CHML1magBjZZNV54X7GzXzwo=; b=QIiVfK0rZdjI759Zh/ivKTpeOlLjMs8XNNHSZ0exqnnc7PpEIRHXUNpROrLPACIfsp rtLD9Hi3VRBTtsf8cDPxsaL4TUWz0X/+PxBl6NT6G+t1+nlPUh9gql6rCwxrchmhXePp tLoD8QwcDApMCsIJyujRU9fqZV0WVWzDhr+5I8zJigHM1Bmrwiyh4b4mo0q1/iYFpYfJ zcYTbp1Vw4P7ouTppwQbClgY/wlke9c+b+I9BnUy6H83RzDSpOyeg71Rid0Zth81h9W2 I3ygEeObjJBF+4wYDrnmwkpeNTKeFJ3UmUQ9Zr6xfpEiagTuRTuvxzdQjWZkLLwTxuyF /TSQ== 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=Zf/b62rCWOQGdkGqxa4CHML1magBjZZNV54X7GzXzwo=; b=QZtwEQdBmU+ZNubKnJEecvdDFE0KizCuZY76UK1ClT89F4fsULz8yPmKcfU8UzsXDD 0vns/e3SME8tH6mA3ihnmzFtkNgkP33qzN8ew/RQaffab+RXzEekKf5gYCH/ApNJ9m5u zNXWOfoB+V2e59qPPQv5wabXQ7RXT9Bgn1zxQmkDQAT4jpcKNpe6wRo+tu8+GFzJWq8e aLpaJIi3jEkq9KZ7rjt4/M6fOCkCRmUXMxIeS9sbBNtTPlVcwnsm2vk6c+TO+wuhgN4/ DVEc8B8HhSFGSFHT/KJaaTWZPYNu41JrLS7rt6Br9o8ZWgOp6MrgvP8fiy65ffO6KcIA MNCg== X-Gm-Message-State: ALyK8tJ7VWptj7moBQ4Mb5LsXCuw4a+OyNMeYskt3+StRFWtCJNPUYjqzdcbr9up9+phe2DX X-Received: by 10.28.182.68 with SMTP id g65mr7296482wmf.12.1466586381607; Wed, 22 Jun 2016 02:06:21 -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 z5sm7019178wme.5.2016.06.22.02.06.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Jun 2016 02:06:21 -0700 (PDT) From: Nelio Laranjeiro To: dev@dpdk.org Cc: Ferruh Yigit , Adrien Mazarguil Date: Wed, 22 Jun 2016 11:05:42 +0200 Message-Id: <1466586355-30777-13-git-send-email-nelio.laranjeiro@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1466586355-30777-1-git-send-email-nelio.laranjeiro@6wind.com> References: <1466493818-1877-1-git-send-email-nelio.laranjeiro@6wind.com> <1466586355-30777-1-git-send-email-nelio.laranjeiro@6wind.com> Subject: [dpdk-dev] [PATCH v4 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jun 2016 09:06:22 -0000 These wrappers are meant to prevent code duplication later. Signed-off-by: Nelio Laranjeiro Signed-off-by: Adrien Mazarguil --- 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 9f3a33b..d7cc39d 100644 --- a/drivers/net/mlx5/mlx5_txq.c +++ b/drivers/net/mlx5/mlx5_txq.c @@ -477,7 +477,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