From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-yh0-f41.google.com (mail-yh0-f41.google.com [209.85.213.41]) by dpdk.org (Postfix) with ESMTP id A2DB45947 for ; Tue, 2 Sep 2014 20:24:58 +0200 (CEST) Received: by mail-yh0-f41.google.com with SMTP id 29so4599329yhl.0 for ; Tue, 02 Sep 2014 11:29:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=z7Dmk7HTBfEPFVtesrQL7XxpRrpL6jQIzC5fu6qmvps=; b=Mv0U4HaSKfOY0Bn3ZfRZUQ/7bhZzMG9ZIGQlnieymIUj9DSR8hBO2Ki7f4ql2eBulb G23HKB2N8iTDCosq+GGueNAIBfyYAkJ1rNgsFdZwh6jeMWJm9CH7QWB3qgZU84vjfQEv pcP1aasWmDn8rffJQTDbyDdQEB86qEdXU2PJ7JwI5ka07f7qSuZU0Qt1ofR/2NwWeyS7 b6PFdkZrHTbxKLFvuhvTG5CxGmqR7iUwYY7nqI/SEpJUK8E6YiaTGphBdPj63yQVJ6MR vUZ/XkxVIaDv+bXldPDG3/gD0OrQmXLl4WLNMHNCGUcVH2ErOwFzbWAzhvdB7VeMEUX9 sEvA== X-Gm-Message-State: ALoCoQn+ccu6aKJJOsTZsYg+8Ux9/h5Dfn0Hk1iety6ZPNmQo4dEbtMelx5SwPLUYtQOtJIqQcG1 MIME-Version: 1.0 X-Received: by 10.236.220.101 with SMTP id n95mr57695053yhp.63.1409682571020; Tue, 02 Sep 2014 11:29:31 -0700 (PDT) Received: by 10.170.96.213 with HTTP; Tue, 2 Sep 2014 11:29:30 -0700 (PDT) In-Reply-To: <1409567080-27083-13-git-send-email-david.marchand@6wind.com> References: <1409567080-27083-1-git-send-email-david.marchand@6wind.com> <1409567080-27083-13-git-send-email-david.marchand@6wind.com> Date: Tue, 2 Sep 2014 13:29:30 -0500 Message-ID: From: Jay Rolette To: David Marchand Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.15 Cc: "dev@dpdk.org" Subject: Re: [dpdk-dev] [PATCH v2 12/17] e1000: use the right debug macro 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: Tue, 02 Sep 2014 18:24:59 -0000 On Mon, Sep 1, 2014 at 5:24 AM, David Marchand wrote: > - We should not use DEBUGOUT* / DEBUGFUNC macros in non-shared code. > These macros come as compat wrappers for shared code. > - We should avoid calling RTE_LOG directly as pmd provides a wrapper for > logs. > > Signed-off-by: David Marchand > --- > lib/librte_pmd_e1000/em_rxtx.c | 32 ++++++++++++++++++-------------- > lib/librte_pmd_e1000/igb_ethdev.c | 9 +++++---- > lib/librte_pmd_e1000/igb_pf.c | 5 +++-- > lib/librte_pmd_e1000/igb_rxtx.c | 16 +++++++--------- > 4 files changed, 33 insertions(+), 29 deletions(-) > > diff --git a/lib/librte_pmd_e1000/em_rxtx.c > b/lib/librte_pmd_e1000/em_rxtx.c > index f254858..01efa50 100644 > --- a/lib/librte_pmd_e1000/em_rxtx.c > +++ b/lib/librte_pmd_e1000/em_rxtx.c > @@ -1211,18 +1211,21 @@ eth_em_tx_queue_setup(struct rte_eth_dev *dev, > DEFAULT_TX_RS_THRESH); > > if (tx_free_thresh >= (nb_desc - 3)) { > - RTE_LOG(ERR, PMD, "tx_free_thresh must be less than the " > - "number of TX descriptors minus 3. > (tx_free_thresh=%u " > - "port=%d queue=%d)\n", (unsigned > int)tx_free_thresh, > - (int)dev->data->port_id, (int)queue_idx); > + PMD_INIT_LOG(ERR, "tx_free_thresh must be less than the " > + "number of TX descriptors minus 3. " > + "(tx_free_thresh=%u port=%d queue=%d)\n", > + (unsigned int)tx_free_thresh, > + (int)dev->data->port_id, (int)queue_idx); > return -(EINVAL); > } > if (tx_rs_thresh > tx_free_thresh) { > - RTE_LOG(ERR, PMD, "tx_rs_thresh must be less than or equal > to " > - "tx_free_thresh. (tx_free_thresh=%u > tx_rs_thresh=%u " > - "port=%d queue=%d)\n", (unsigned > int)tx_free_thresh, > - (unsigned int)tx_rs_thresh, > (int)dev->data->port_id, > - (int)queue_idx); > + PMD_INIT_LOG(ERR, "tx_rs_thresh must be less than or equal > to " > + "tx_free_thresh. (tx_free_thresh=%u " > + "tx_rs_thresh=%u port=%d queue=%d)\n", > + (unsigned int)tx_free_thresh, > + (unsigned int)tx_rs_thresh, > + (int)dev->data->port_id, > + (int)queue_idx); > return -(EINVAL); > } > > @@ -1233,10 +1236,10 @@ eth_em_tx_queue_setup(struct rte_eth_dev *dev, > * accumulates WTHRESH descriptors. > */ > if (tx_conf->tx_thresh.wthresh != 0 && tx_rs_thresh != 1) { > - RTE_LOG(ERR, PMD, "TX WTHRESH must be set to 0 if " > - "tx_rs_thresh is greater than 1. (tx_rs_thresh=%u " > - "port=%d queue=%d)\n", (unsigned int)tx_rs_thresh, > - (int)dev->data->port_id, (int)queue_idx); > + PMD_INIT_LOG(ERR, "TX WTHRESH must be set to 0 if " > + "tx_rs_thresh is greater than 1. > (tx_rs_thresh=%u " > + "port=%d queue=%d)\n", (unsigned > int)tx_rs_thresh, > + (int)dev->data->port_id, (int)queue_idx); > return -(EINVAL); > } > > @@ -1366,7 +1369,8 @@ eth_em_rx_queue_setup(struct rte_eth_dev *dev, > * EM devices don't support drop_en functionality > */ > if (rx_conf->rx_drop_en) { > - RTE_LOG(ERR, PMD, "drop_en functionality not supported by > device\n"); > + PMD_INIT_LOG(ERR, "drop_en functionality not supported by " > + "device\n"); > return (-EINVAL); > } > > diff --git a/lib/librte_pmd_e1000/igb_ethdev.c > b/lib/librte_pmd_e1000/igb_ethdev.c > index 3187d92..b45eb24 100644 > --- a/lib/librte_pmd_e1000/igb_ethdev.c > +++ b/lib/librte_pmd_e1000/igb_ethdev.c > @@ -400,7 +400,7 @@ igb_reset_swfw_lock(struct e1000_hw *hw) > * So force the release of the faulty lock. > */ > if (e1000_get_hw_semaphore_generic(hw) < 0) { > - DEBUGOUT("SMBI lock released"); > + PMD_DRV_LOG(DEBUG, "SMBI lock released"); > } > e1000_put_hw_semaphore_generic(hw); > > @@ -416,7 +416,8 @@ igb_reset_swfw_lock(struct e1000_hw *hw) > if (hw->bus.func > E1000_FUNC_1) > mask <<= 2; > if (hw->mac.ops.acquire_swfw_sync(hw, mask) < 0) { > - DEBUGOUT1("SWFW phy%d lock released", > hw->bus.func); > + PMD_DRV_LOG(DEBUG, "SWFW phy%d lock released", > + hw->bus.func); > } > hw->mac.ops.release_swfw_sync(hw, mask); > > @@ -428,7 +429,7 @@ igb_reset_swfw_lock(struct e1000_hw *hw) > */ > mask = E1000_SWFW_EEP_SM; > if (hw->mac.ops.acquire_swfw_sync(hw, mask) < 0) { > - DEBUGOUT("SWFW common locks released"); > + PMD_DRV_LOG(DEBUG, "SWFW common locks released"); > } > hw->mac.ops.release_swfw_sync(hw, mask); > } > @@ -707,7 +708,7 @@ igb_vmdq_vlan_hw_filter_enable(struct rte_eth_dev *dev) > static int > rte_igbvf_pmd_init(const char *name __rte_unused, const char *params > __rte_unused) > { > - DEBUGFUNC("rte_igbvf_pmd_init"); > + PMD_INIT_FUNC_TRACE(); > > rte_eth_driver_register(&rte_igbvf_pmd); > return (0); > diff --git a/lib/librte_pmd_e1000/igb_pf.c b/lib/librte_pmd_e1000/igb_pf.c > index 3d405f0..76033ad 100644 > --- a/lib/librte_pmd_e1000/igb_pf.c > +++ b/lib/librte_pmd_e1000/igb_pf.c > @@ -404,7 +404,7 @@ igb_rcv_msg_from_vf(struct rte_eth_dev *dev, uint16_t > vf) > > retval = e1000_read_mbx(hw, msgbuf, mbx_size, vf); > if (retval) { > - RTE_LOG(ERR, PMD, "Error mbx recv msg from VF %d\n", vf); > + PMD_INIT_LOG(ERR, "Error mbx recv msg from VF %d\n", vf); > return retval; > } > > @@ -432,7 +432,8 @@ igb_rcv_msg_from_vf(struct rte_eth_dev *dev, uint16_t > vf) > retval = igb_vf_set_vlan(dev, vf, msgbuf); > break; > default: > - RTE_LOG(DEBUG, PMD, "Unhandled Msg %8.8x\n", (unsigned) > msgbuf[0]); > + PMD_INIT_LOG(DEBUG, "Unhandled Msg %8.8x\n", > + (unsigned) msgbuf[0]); > retval = E1000_ERR_MBX; > break; > } > diff --git a/lib/librte_pmd_e1000/igb_rxtx.c > b/lib/librte_pmd_e1000/igb_rxtx.c > index 977c4a2..3aa9609 100644 > --- a/lib/librte_pmd_e1000/igb_rxtx.c > +++ b/lib/librte_pmd_e1000/igb_rxtx.c > @@ -1210,17 +1210,15 @@ eth_igb_tx_queue_setup(struct rte_eth_dev *dev, > * driver. > */ > if (tx_conf->tx_free_thresh != 0) > - RTE_LOG(WARNING, PMD, > - "The tx_free_thresh parameter is not " > - "used for the 1G driver.\n"); > + PMD_INIT_LOG(WARNING, "The tx_free_thresh parameter is not > " > + "used for the 1G driver.\n"); > if (tx_conf->tx_rs_thresh != 0) > - RTE_LOG(WARNING, PMD, > - "The tx_rs_thresh parameter is not " > - "used for the 1G driver.\n"); > + PMD_INIT_LOG(WARNING, "The tx_rs_thresh parameter is not " > + "used for the 1G driver.\n"); > if (tx_conf->tx_thresh.wthresh == 0) > - RTE_LOG(WARNING, PMD, > - "To improve 1G driver performance, consider > setting " > - "the TX WTHRESH value to 4, 8, or 16.\n"); > + PMD_INIT_LOG(WARNING, "To improve 1G driver performance, " > + "consider setting the TX WTHRESH value to 4, > 8, " > + "or 16.\n"); > > /* Free memory prior to re-allocation if needed */ > if (dev->data->tx_queues[queue_idx] != NULL) { > -- > 1.7.10.4 > > Reviewed-by: Jay Rolette