From: Dekel Peled <dekelp@mellanox.com>
To: yskoh@mellanox.com, shahafs@mellanox.com
Cc: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v4 4/4] net/mlx5: move locally used functions to static
Date: Wed, 8 May 2019 11:29:41 +0300 [thread overview]
Message-ID: <43a34658fc2fa41cbe675ecd7571930343b7734e.1557303531.git.dekelp@mellanox.com> (raw)
Message-ID: <20190508082941.snmEHvn1YA16P1A9g7XItXbf-iJkPJl6x9W5HQapr9I@z> (raw)
In-Reply-To: <cover.1557303531.git.dekelp@mellanox.com>
Multiple functions were declared in header file mlx5_rxtx.h,
inplemented in mlx5_rxq.c, and called only in mlx5_rxq.c.
This patch moves all these functions declarations into mlx5_rxq.c,
as static functions.
Some functions implementation was copied higher in the file to
precede the functions calls.
Signed-off-by: Dekel Peled <dekelp@mellanox.com>
Acked-by: Shahaf Shuler <shahafs@mellanox.com>
Acked-by: Yongseok Koh <yskoh@mellanox.com>
---
drivers/net/mlx5/mlx5_rxq.c | 183 +++++++++++++++++++++----------------------
drivers/net/mlx5/mlx5_rxtx.h | 15 ----
2 files changed, 91 insertions(+), 107 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index f10e896..3330057 100644
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -398,6 +398,33 @@
}
/**
+ * Verify if the queue can be released.
+ *
+ * @param dev
+ * Pointer to Ethernet device.
+ * @param idx
+ * RX queue index.
+ *
+ * @return
+ * 1 if the queue can be released
+ * 0 if the queue can not be released, there are references to it.
+ * Negative errno and rte_errno is set if queue doesn't exist.
+ */
+static int
+mlx5_rxq_releasable(struct rte_eth_dev *dev, uint16_t idx)
+{
+ struct mlx5_priv *priv = dev->data->dev_private;
+ struct mlx5_rxq_ctrl *rxq_ctrl;
+
+ if (!(*priv->rxqs)[idx]) {
+ rte_errno = EINVAL;
+ return -rte_errno;
+ }
+ rxq_ctrl = container_of((*priv->rxqs)[idx], struct mlx5_rxq_ctrl, rxq);
+ return (rte_atomic32_read(&rxq_ctrl->refcnt) == 1);
+}
+
+/**
*
* @param dev
* Pointer to Ethernet device structure.
@@ -485,6 +512,63 @@
}
/**
+ * Get an Rx queue Verbs object.
+ *
+ * @param dev
+ * Pointer to Ethernet device.
+ * @param idx
+ * Queue index in DPDK Rx queue array
+ *
+ * @return
+ * The Verbs object if it exists.
+ */
+static struct mlx5_rxq_ibv *
+mlx5_rxq_ibv_get(struct rte_eth_dev *dev, uint16_t idx)
+{
+ struct mlx5_priv *priv = dev->data->dev_private;
+ struct mlx5_rxq_data *rxq_data = (*priv->rxqs)[idx];
+ struct mlx5_rxq_ctrl *rxq_ctrl;
+
+ if (idx >= priv->rxqs_n)
+ return NULL;
+ if (!rxq_data)
+ return NULL;
+ rxq_ctrl = container_of(rxq_data, struct mlx5_rxq_ctrl, rxq);
+ if (rxq_ctrl->ibv)
+ rte_atomic32_inc(&rxq_ctrl->ibv->refcnt);
+ return rxq_ctrl->ibv;
+}
+
+/**
+ * Release an Rx verbs queue object.
+ *
+ * @param rxq_ibv
+ * Verbs Rx queue object.
+ *
+ * @return
+ * 1 while a reference on it exists, 0 when freed.
+ */
+static int
+mlx5_rxq_ibv_release(struct mlx5_rxq_ibv *rxq_ibv)
+{
+ assert(rxq_ibv);
+ assert(rxq_ibv->wq);
+ assert(rxq_ibv->cq);
+ if (rte_atomic32_dec_and_test(&rxq_ibv->refcnt)) {
+ rxq_free_elts(rxq_ibv->rxq_ctrl);
+ claim_zero(mlx5_glue->destroy_wq(rxq_ibv->wq));
+ claim_zero(mlx5_glue->destroy_cq(rxq_ibv->cq));
+ if (rxq_ibv->channel)
+ claim_zero(mlx5_glue->destroy_comp_channel
+ (rxq_ibv->channel));
+ LIST_REMOVE(rxq_ibv, next);
+ rte_free(rxq_ibv);
+ return 0;
+ }
+ return 1;
+}
+
+/**
* Allocate queue vector and fill epoll fd list for Rx interrupts.
*
* @param dev
@@ -1013,64 +1097,6 @@ struct mlx5_rxq_ibv *
}
/**
- * Get an Rx queue Verbs object.
- *
- * @param dev
- * Pointer to Ethernet device.
- * @param idx
- * Queue index in DPDK Rx queue array
- *
- * @return
- * The Verbs object if it exists.
- */
-struct mlx5_rxq_ibv *
-mlx5_rxq_ibv_get(struct rte_eth_dev *dev, uint16_t idx)
-{
- struct mlx5_priv *priv = dev->data->dev_private;
- struct mlx5_rxq_data *rxq_data = (*priv->rxqs)[idx];
- struct mlx5_rxq_ctrl *rxq_ctrl;
-
- if (idx >= priv->rxqs_n)
- return NULL;
- if (!rxq_data)
- return NULL;
- rxq_ctrl = container_of(rxq_data, struct mlx5_rxq_ctrl, rxq);
- if (rxq_ctrl->ibv) {
- rte_atomic32_inc(&rxq_ctrl->ibv->refcnt);
- }
- return rxq_ctrl->ibv;
-}
-
-/**
- * Release an Rx verbs queue object.
- *
- * @param rxq_ibv
- * Verbs Rx queue object.
- *
- * @return
- * 1 while a reference on it exists, 0 when freed.
- */
-int
-mlx5_rxq_ibv_release(struct mlx5_rxq_ibv *rxq_ibv)
-{
- assert(rxq_ibv);
- assert(rxq_ibv->wq);
- assert(rxq_ibv->cq);
- if (rte_atomic32_dec_and_test(&rxq_ibv->refcnt)) {
- rxq_free_elts(rxq_ibv->rxq_ctrl);
- claim_zero(mlx5_glue->destroy_wq(rxq_ibv->wq));
- claim_zero(mlx5_glue->destroy_cq(rxq_ibv->cq));
- if (rxq_ibv->channel)
- claim_zero(mlx5_glue->destroy_comp_channel
- (rxq_ibv->channel));
- LIST_REMOVE(rxq_ibv, next);
- rte_free(rxq_ibv);
- return 0;
- }
- return 1;
-}
-
-/**
* Verify the Verbs Rx queue list is empty
*
* @param dev
@@ -1519,33 +1545,6 @@ struct mlx5_rxq_ctrl *
}
/**
- * Verify if the queue can be released.
- *
- * @param dev
- * Pointer to Ethernet device.
- * @param idx
- * RX queue index.
- *
- * @return
- * 1 if the queue can be released
- * 0 if the queue can not be released, there are references to it.
- * Negative errno and rte_errno is set if queue doesn't exist.
- */
-int
-mlx5_rxq_releasable(struct rte_eth_dev *dev, uint16_t idx)
-{
- struct mlx5_priv *priv = dev->data->dev_private;
- struct mlx5_rxq_ctrl *rxq_ctrl;
-
- if (!(*priv->rxqs)[idx]) {
- rte_errno = EINVAL;
- return -rte_errno;
- }
- rxq_ctrl = container_of((*priv->rxqs)[idx], struct mlx5_rxq_ctrl, rxq);
- return (rte_atomic32_read(&rxq_ctrl->refcnt) == 1);
-}
-
-/**
* Verify the Rx Queue list is empty
*
* @param dev
@@ -1582,7 +1581,7 @@ struct mlx5_rxq_ctrl *
* @return
* The Verbs object initialised, NULL otherwise and rte_errno is set.
*/
-struct mlx5_ind_table_ibv *
+static struct mlx5_ind_table_ibv *
mlx5_ind_table_ibv_new(struct rte_eth_dev *dev, const uint16_t *queues,
uint32_t queues_n)
{
@@ -1646,7 +1645,7 @@ struct mlx5_ind_table_ibv *
* @return
* An indirection table if found.
*/
-struct mlx5_ind_table_ibv *
+static struct mlx5_ind_table_ibv *
mlx5_ind_table_ibv_get(struct rte_eth_dev *dev, const uint16_t *queues,
uint32_t queues_n)
{
@@ -1681,7 +1680,7 @@ struct mlx5_ind_table_ibv *
* @return
* 1 while a reference on it exists, 0 when freed.
*/
-int
+static int
mlx5_ind_table_ibv_release(struct rte_eth_dev *dev,
struct mlx5_ind_table_ibv *ind_tbl)
{
@@ -1965,7 +1964,7 @@ struct mlx5_hrxq *
* @return
* The Verbs object initialised, NULL otherwise and rte_errno is set.
*/
-struct mlx5_rxq_ibv *
+static struct mlx5_rxq_ibv *
mlx5_rxq_ibv_drop_new(struct rte_eth_dev *dev)
{
struct mlx5_priv *priv = dev->data->dev_private;
@@ -2025,7 +2024,7 @@ struct mlx5_rxq_ibv *
* @return
* The Verbs object initialised, NULL otherwise and rte_errno is set.
*/
-void
+static void
mlx5_rxq_ibv_drop_release(struct rte_eth_dev *dev)
{
struct mlx5_priv *priv = dev->data->dev_private;
@@ -2048,7 +2047,7 @@ struct mlx5_rxq_ibv *
* @return
* The Verbs object initialised, NULL otherwise and rte_errno is set.
*/
-struct mlx5_ind_table_ibv *
+static struct mlx5_ind_table_ibv *
mlx5_ind_table_ibv_drop_new(struct rte_eth_dev *dev)
{
struct mlx5_priv *priv = dev->data->dev_private;
@@ -2091,7 +2090,7 @@ struct mlx5_ind_table_ibv *
* @param dev
* Pointer to Ethernet device.
*/
-void
+static void
mlx5_ind_table_ibv_drop_release(struct rte_eth_dev *dev)
{
struct mlx5_priv *priv = dev->data->dev_private;
diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h
index 104ba7c..0ff5508 100644
--- a/drivers/net/mlx5/mlx5_rxtx.h
+++ b/drivers/net/mlx5/mlx5_rxtx.h
@@ -258,10 +258,6 @@ int mlx5_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
int mlx5_rx_intr_enable(struct rte_eth_dev *dev, uint16_t rx_queue_id);
int mlx5_rx_intr_disable(struct rte_eth_dev *dev, uint16_t rx_queue_id);
struct mlx5_rxq_ibv *mlx5_rxq_ibv_new(struct rte_eth_dev *dev, uint16_t idx);
-struct mlx5_rxq_ibv *mlx5_rxq_ibv_get(struct rte_eth_dev *dev, uint16_t idx);
-int mlx5_rxq_ibv_release(struct mlx5_rxq_ibv *rxq_ibv);
-struct mlx5_rxq_ibv *mlx5_rxq_ibv_drop_new(struct rte_eth_dev *dev);
-void mlx5_rxq_ibv_drop_release(struct rte_eth_dev *dev);
int mlx5_rxq_ibv_verify(struct rte_eth_dev *dev);
struct mlx5_rxq_ctrl *mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx,
uint16_t desc, unsigned int socket,
@@ -269,20 +265,9 @@ struct mlx5_rxq_ctrl *mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx,
struct rte_mempool *mp);
struct mlx5_rxq_ctrl *mlx5_rxq_get(struct rte_eth_dev *dev, uint16_t idx);
int mlx5_rxq_release(struct rte_eth_dev *dev, uint16_t idx);
-int mlx5_rxq_releasable(struct rte_eth_dev *dev, uint16_t idx);
int mlx5_rxq_verify(struct rte_eth_dev *dev);
int rxq_alloc_elts(struct mlx5_rxq_ctrl *rxq_ctrl);
-struct mlx5_ind_table_ibv *mlx5_ind_table_ibv_new(struct rte_eth_dev *dev,
- const uint16_t *queues,
- uint32_t queues_n);
-struct mlx5_ind_table_ibv *mlx5_ind_table_ibv_get(struct rte_eth_dev *dev,
- const uint16_t *queues,
- uint32_t queues_n);
-int mlx5_ind_table_ibv_release(struct rte_eth_dev *dev,
- struct mlx5_ind_table_ibv *ind_tbl);
int mlx5_ind_table_ibv_verify(struct rte_eth_dev *dev);
-struct mlx5_ind_table_ibv *mlx5_ind_table_ibv_drop_new(struct rte_eth_dev *dev);
-void mlx5_ind_table_ibv_drop_release(struct rte_eth_dev *dev);
struct mlx5_hrxq *mlx5_hrxq_new(struct rte_eth_dev *dev,
const uint8_t *rss_key, uint32_t rss_key_len,
uint64_t hash_fields,
--
1.8.3.1
next prev parent reply other threads:[~2019-05-08 8:37 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-29 11:00 [dpdk-dev] [PATCH 0/4] net/mlx5: code cleanup in rx and tx files Dekel Peled
2019-04-29 11:00 ` Dekel Peled
2019-04-29 11:00 ` [dpdk-dev] [PATCH 1/4] net/mlx5: remove unused functions Dekel Peled
2019-04-29 11:00 ` Dekel Peled
2019-04-29 11:00 ` [dpdk-dev] [PATCH 2/4] net/mlx5: add missing validation of null pointer Dekel Peled
2019-04-29 11:00 ` Dekel Peled
2019-04-29 11:00 ` [dpdk-dev] [PATCH 3/4] net/mlx5: fix description of function return value Dekel Peled
2019-04-29 11:00 ` Dekel Peled
2019-04-29 11:00 ` [dpdk-dev] [PATCH 4/4] net/mlx5: move locally used functions to static Dekel Peled
2019-04-29 11:00 ` Dekel Peled
2019-05-02 14:10 ` [dpdk-dev] [PATCH 0/4] net/mlx5: code cleanup in rx and tx files Shahaf Shuler
2019-05-02 14:10 ` Shahaf Shuler
2019-05-02 15:01 ` [dpdk-dev] [PATCH v2 " Dekel Peled
2019-05-02 15:01 ` Dekel Peled
2019-05-02 15:01 ` [dpdk-dev] [PATCH v2 1/4] net/mlx5: remove unused functions Dekel Peled
2019-05-02 15:01 ` Dekel Peled
2019-05-02 18:13 ` Yongseok Koh
2019-05-02 18:13 ` Yongseok Koh
2019-05-02 15:01 ` [dpdk-dev] [PATCH v2 2/4] net/mlx5: fix missing validation of null pointer Dekel Peled
2019-05-02 15:01 ` Dekel Peled
2019-05-02 18:12 ` Yongseok Koh
2019-05-02 18:12 ` Yongseok Koh
2019-05-02 15:01 ` [dpdk-dev] [PATCH v2 3/4] net/mlx5: fix description of function return value Dekel Peled
2019-05-02 15:01 ` Dekel Peled
2019-05-02 18:13 ` Yongseok Koh
2019-05-02 18:13 ` Yongseok Koh
2019-05-02 15:01 ` [dpdk-dev] [PATCH v2 4/4] net/mlx5: move locally used functions to static Dekel Peled
2019-05-02 15:01 ` Dekel Peled
2019-05-02 18:14 ` Yongseok Koh
2019-05-02 18:14 ` Yongseok Koh
2019-05-05 13:09 ` [dpdk-dev] [PATCH v3 0/4] net/mlx5: code cleanup in rx and tx files Dekel Peled
2019-05-05 13:09 ` Dekel Peled
2019-05-05 13:09 ` [dpdk-dev] [PATCH v3 1/4] net/mlx5: remove unused functions Dekel Peled
2019-05-05 13:09 ` Dekel Peled
2019-05-05 13:09 ` [dpdk-dev] [PATCH v3 2/4] net/mlx5: fix missing validation of null pointer Dekel Peled
2019-05-05 13:09 ` Dekel Peled
2019-05-05 13:09 ` [dpdk-dev] [PATCH v3 3/4] net/mlx5: fix description of function return value Dekel Peled
2019-05-05 13:09 ` Dekel Peled
2019-05-05 13:09 ` [dpdk-dev] [PATCH v3 4/4] net/mlx5: move locally used functions to static Dekel Peled
2019-05-05 13:09 ` Dekel Peled
2019-05-08 4:43 ` [dpdk-dev] [PATCH v3 0/4] net/mlx5: code cleanup in rx and tx files Shahaf Shuler
2019-05-08 4:43 ` Shahaf Shuler
2019-05-08 8:29 ` [dpdk-dev] [PATCH v4 " Dekel Peled
2019-05-08 8:29 ` Dekel Peled
2019-05-08 8:29 ` [dpdk-dev] [PATCH v4 1/4] net/mlx5: remove unused functions Dekel Peled
2019-05-08 8:29 ` Dekel Peled
2019-05-08 8:29 ` [dpdk-dev] [PATCH v4 2/4] net/mlx5: fix missing validation of null pointer Dekel Peled
2019-05-08 8:29 ` Dekel Peled
2019-05-08 8:29 ` [dpdk-dev] [PATCH v4 3/4] net/mlx5: fix description of function return value Dekel Peled
2019-05-08 8:29 ` Dekel Peled
2019-05-08 8:29 ` Dekel Peled [this message]
2019-05-08 8:29 ` [dpdk-dev] [PATCH v4 4/4] net/mlx5: move locally used functions to static Dekel Peled
2019-05-22 20:35 ` [dpdk-dev] [PATCH v4 0/4] net/mlx5: code cleanup in rx and tx files Shahaf Shuler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=43a34658fc2fa41cbe675ecd7571930343b7734e.1557303531.git.dekelp@mellanox.com \
--to=dekelp@mellanox.com \
--cc=dev@dpdk.org \
--cc=shahafs@mellanox.com \
--cc=yskoh@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).