From patchwork Thu Oct 5 12:49:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?N=C3=A9lio_Laranjeiro?= X-Patchwork-Id: 29696 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 [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EE04E1B1BB; Thu, 5 Oct 2017 14:50:35 +0200 (CEST) Received: from mail-wm0-f49.google.com (mail-wm0-f49.google.com [74.125.82.49]) by dpdk.org (Postfix) with ESMTP id E5A401B19C for ; Thu, 5 Oct 2017 14:50:29 +0200 (CEST) Received: by mail-wm0-f49.google.com with SMTP id l68so1972938wmd.5 for ; Thu, 05 Oct 2017 05:50:29 -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 :in-reply-to:references; bh=/gHOIwKueEtF7UXEK8hci29of5KF+U0ctDBuJKVHzSg=; b=d3gOK93Lfa/cFau+pSZETEJW87PGzHcXiKBxeBZVM9e8hEno32UDc8FdSKlsvqH0h7 mmUkZrsgDtiSqRUegHCzpGS47oAnyT6wX3Ke/B59bxpZdMY3G/0a/5MTSsaLYZ/iNX+K iSdMA86djaMfihjBKVVuNAMI99LC26l/oqgpiqNxSGKt85rvKSJuwvGoUWAWuOm2B7+3 y4GV7D0ZNLz7y7AtpxG4MHmEhxmSOPVSvCA+ZIDMZ2MYeidUSzDtbZkeUbPiKgbGDsl2 4IrR9zs8rKv1R2FIwNSQYjE24zbnCVQFEPiVJELzkk/8YBiyZ38vCfDwtSv8MvWffFwo y2sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=/gHOIwKueEtF7UXEK8hci29of5KF+U0ctDBuJKVHzSg=; b=mvmsqf1sE+eA9GB4vMBrFa2gWFVfPzBRqjrVKyQLepxJ6L7nDRYu5YW7c0JR4iNDAQ qlf0Uat6XwBCV77IisxYUxq0bTeaZH03j3b4BWcSUfksoWWf8q1r4ef6pGW3OMRgX+Qs /3xRg+NVZVkp/idhn9pZ8qBWldfpXw6XvARXaDVT9yanSPREBR0DuFeJn8IjwkkYGZRR 3Mi++8WaOzdeuBKotmYVlnilo0DZqV3OkvGVPkJqB3dpPRB+Bmn5dootbaIAGeKL2YKD neJDCT6akti6EBAK7LqDoFF3TBsXp5LHlLjHXZ5JZYBWt6CIJ1ypqenkdWVm/eTyE+E+ RQ5Q== X-Gm-Message-State: AMCzsaV2gTQzV/b7anNX2fvjlR9Ly/Se+FfBR3lt+tQpTz0oZlncK3AD GMHYpqqeCVJUKHm5r7RSf/aNKhY13g== X-Google-Smtp-Source: AOwi7QAg/+U3bzMYFz1xFyw/w2MRYhDPfornsabIOwnLbkMFyWN/EXRVTOeMUatEG0hNeblpYh4VRw== X-Received: by 10.28.23.76 with SMTP id 73mr21053129wmx.70.1507207829396; Thu, 05 Oct 2017 05:50:29 -0700 (PDT) Received: from ping.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id k9sm26405823wrk.27.2017.10.05.05.50.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 05 Oct 2017 05:50:28 -0700 (PDT) From: Nelio Laranjeiro To: dev@dpdk.org Cc: adrien.mazarguil@6wind.com, yskoh@mellanox.com, ferruh.yigit@intel.com Date: Thu, 5 Oct 2017 14:49:37 +0200 Message-Id: <9a3af2c2f76689192cbf4f68d75807530d681d72.1507207731.git.nelio.laranjeiro@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v2 05/30] net/mlx5: remove redundant started flag 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 flag is already present in the Ethernet device. Signed-off-by: Nelio Laranjeiro Acked-by: Yongseok Koh --- drivers/net/mlx5/mlx5.h | 1 - drivers/net/mlx5/mlx5_flow.c | 6 +++--- drivers/net/mlx5/mlx5_rxq.c | 2 +- drivers/net/mlx5/mlx5_trigger.c | 12 ------------ drivers/net/mlx5/mlx5_txq.c | 2 +- 5 files changed, 5 insertions(+), 18 deletions(-) diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 1b511e1..3c58f7a 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -104,7 +104,6 @@ struct priv { /* Device properties. */ uint16_t mtu; /* Configured MTU. */ uint8_t port; /* Physical port number. */ - unsigned int started:1; /* Device started, flows enabled. */ unsigned int promisc_req:1; /* Promiscuous mode requested. */ unsigned int allmulti_req:1; /* All multicast mode requested. */ unsigned int hw_csum:1; /* Checksum offload is supported. */ diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 99dbd8c..3504c43 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -1052,7 +1052,7 @@ priv_flow_create_action_queue_drop(struct priv *priv, ++flow->ibv_attr->num_of_specs; flow->offset += sizeof(struct ibv_flow_spec_action_drop); rte_flow->ibv_attr = flow->ibv_attr; - if (!priv->started) + if (!priv->dev->data->dev_started) return rte_flow; rte_flow->qp = priv->flow_drop_queue->qp; rte_flow->ibv_flow = ibv_create_flow(rte_flow->qp, @@ -1158,7 +1158,7 @@ priv_flow_create_action_queue(struct priv *priv, NULL, "cannot allocate QP"); goto error; } - if (!priv->started) + if (!priv->dev->data->dev_started) return rte_flow; rte_flow->ibv_flow = ibv_create_flow(rte_flow->qp, rte_flow->ibv_attr); @@ -1618,7 +1618,7 @@ mlx5_flow_isolate(struct rte_eth_dev *dev, struct priv *priv = dev->data->dev_private; priv_lock(priv); - if (priv->started) { + if (dev->data->dev_started) { rte_flow_error_set(error, EBUSY, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c index 6e520fb..683a4a7 100644 --- a/drivers/net/mlx5/mlx5_rxq.c +++ b/drivers/net/mlx5/mlx5_rxq.c @@ -1150,7 +1150,7 @@ mlx5_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, if (rxq != NULL) { DEBUG("%p: reusing already allocated queue index %u (%p)", (void *)dev, idx, (void *)rxq); - if (priv->started) { + if (dev->data->dev_started) { priv_unlock(priv); return -EEXIST; } diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c index 0d0f340..212b4df 100644 --- a/drivers/net/mlx5/mlx5_trigger.c +++ b/drivers/net/mlx5/mlx5_trigger.c @@ -61,10 +61,6 @@ mlx5_dev_start(struct rte_eth_dev *dev) return -E_RTE_SECONDARY; priv_lock(priv); - if (priv->started) { - priv_unlock(priv); - return 0; - } /* Update Rx/Tx callback. */ priv_dev_select_tx_function(priv, dev); priv_dev_select_rx_function(priv, dev); @@ -72,8 +68,6 @@ mlx5_dev_start(struct rte_eth_dev *dev) err = priv_create_hash_rxqs(priv); if (!err) err = priv_rehash_flows(priv); - if (!err) - priv->started = 1; else { ERROR("%p: an error occurred while configuring hash RX queues:" " %s", @@ -82,7 +76,6 @@ mlx5_dev_start(struct rte_eth_dev *dev) } err = priv_flow_start(priv); if (err) { - priv->started = 0; ERROR("%p: an error occurred while configuring flows:" " %s", (void *)priv, strerror(err)); @@ -125,10 +118,6 @@ mlx5_dev_stop(struct rte_eth_dev *dev) return; priv_lock(priv); - if (!priv->started) { - priv_unlock(priv); - return; - } DEBUG("%p: cleaning up and destroying hash RX queues", (void *)dev); priv_special_flow_disable_all(priv); priv_mac_addrs_disable(priv); @@ -136,6 +125,5 @@ mlx5_dev_stop(struct rte_eth_dev *dev) priv_flow_stop(priv); priv_rx_intr_vec_disable(priv); priv_dev_interrupt_handler_uninstall(priv, dev); - priv->started = 0; priv_unlock(priv); } diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c index ee9f703..f551f87 100644 --- a/drivers/net/mlx5/mlx5_txq.c +++ b/drivers/net/mlx5/mlx5_txq.c @@ -490,7 +490,7 @@ mlx5_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, if (txq != NULL) { DEBUG("%p: reusing already allocated queue index %u (%p)", (void *)dev, idx, (void *)txq); - if (priv->started) { + if (dev->data->dev_started) { priv_unlock(priv); return -EEXIST; }