From: Dany Madden <drt@linux•ibm.com>
To: Sukadev Bhattiprolu <sukadev@linux•ibm.com>
Cc: netdev@vger•kernel.org, Brian King <brking@linux•ibm.com>,
cforno12@linux•ibm.com, Rick Lindsley <ricklind@linux•ibm.com>
Subject: Re: [PATCH net-next 2/9] ibmvnic: Fix up some comments and messages
Date: Tue, 31 Aug 2021 18:28:11 -0700 [thread overview]
Message-ID: <ef067dcb0cf71def84658c3e405c7fb2@imap.linux.ibm.com> (raw)
In-Reply-To: <20210901000812.120968-3-sukadev@linux.ibm.com>
On 2021-08-31 17:08, Sukadev Bhattiprolu wrote:
> Add/update some comments/function headers and fix up some messages.
>
> Signed-off-by: Sukadev Bhattiprolu <sukadev@linux•ibm.com>
Reviewed-by: Dany Madden <drt@linux•ibm.com>
> ---
> drivers/net/ethernet/ibm/ibmvnic.c | 40 +++++++++++++++++++++++++-----
> 1 file changed, 34 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/ethernet/ibm/ibmvnic.c
> b/drivers/net/ethernet/ibm/ibmvnic.c
> index e8b1231be485..911315b10731 100644
> --- a/drivers/net/ethernet/ibm/ibmvnic.c
> +++ b/drivers/net/ethernet/ibm/ibmvnic.c
> @@ -243,14 +243,13 @@ static int alloc_long_term_buff(struct
> ibmvnic_adapter *adapter,
>
> rc = ibmvnic_wait_for_completion(adapter, &adapter->fw_done, 10000);
> if (rc) {
> - dev_err(dev,
> - "Long term map request aborted or timed out,rc = %d\n",
> + dev_err(dev, "LTB map request aborted or timed out, rc = %d\n",
> rc);
> goto out;
> }
>
> if (adapter->fw_done_rc) {
> - dev_err(dev, "Couldn't map long term buffer,rc = %d\n",
> + dev_err(dev, "Couldn't map LTB, rc = %d\n",
> adapter->fw_done_rc);
> rc = -1;
> goto out;
> @@ -281,7 +280,9 @@ static void free_long_term_buff(struct
> ibmvnic_adapter *adapter,
> adapter->reset_reason != VNIC_RESET_MOBILITY &&
> adapter->reset_reason != VNIC_RESET_TIMEOUT)
> send_request_unmap(adapter, ltb->map_id);
> +
> dma_free_coherent(dev, ltb->size, ltb->buff, ltb->addr);
> +
> ltb->buff = NULL;
> ltb->map_id = 0;
> }
> @@ -574,6 +575,10 @@ static int reset_rx_pools(struct ibmvnic_adapter
> *adapter)
> return 0;
> }
>
> +/**
> + * Release any rx_pools attached to @adapter.
> + * Safe to call this multiple times - even if no pools are attached.
> + */
> static void release_rx_pools(struct ibmvnic_adapter *adapter)
> {
> struct ibmvnic_rx_pool *rx_pool;
> @@ -628,6 +633,9 @@ static int init_rx_pools(struct net_device *netdev)
> return -1;
> }
>
> + /* Set num_active_rx_pools early. If we fail below after partial
> + * allocation, release_rx_pools() will know how many to look for.
> + */
> adapter->num_active_rx_pools = rxadd_subcrqs;
>
> for (i = 0; i < rxadd_subcrqs; i++) {
> @@ -646,6 +654,7 @@ static int init_rx_pools(struct net_device *netdev)
> rx_pool->free_map = kcalloc(rx_pool->size, sizeof(int),
> GFP_KERNEL);
> if (!rx_pool->free_map) {
> + dev_err(dev, "Couldn't alloc free_map %d\n", i);
> release_rx_pools(adapter);
> return -1;
> }
> @@ -739,10 +748,17 @@ static void release_one_tx_pool(struct
> ibmvnic_adapter *adapter,
> free_long_term_buff(adapter, &tx_pool->long_term_buff);
> }
>
> +/**
> + * Release any tx and tso pools attached to @adapter.
> + * Safe to call this multiple times - even if no pools are attached.
> + */
> static void release_tx_pools(struct ibmvnic_adapter *adapter)
> {
> int i;
>
> + /* init_tx_pools() ensures that ->tx_pool and ->tso_pool are
> + * both NULL or both non-NULL. So we only need to check one.
> + */
> if (!adapter->tx_pool)
> return;
>
> @@ -793,6 +809,7 @@ static int init_one_tx_pool(struct net_device
> *netdev,
> static int init_tx_pools(struct net_device *netdev)
> {
> struct ibmvnic_adapter *adapter = netdev_priv(netdev);
> + struct device *dev = &adapter->vdev->dev;
> int tx_subcrqs;
> u64 buff_size;
> int i, rc;
> @@ -805,17 +822,27 @@ static int init_tx_pools(struct net_device
> *netdev)
>
> adapter->tso_pool = kcalloc(tx_subcrqs,
> sizeof(struct ibmvnic_tx_pool), GFP_KERNEL);
> + /* To simplify release_tx_pools() ensure that ->tx_pool and
> + * ->tso_pool are either both NULL or both non-NULL.
> + */
> if (!adapter->tso_pool) {
> kfree(adapter->tx_pool);
> adapter->tx_pool = NULL;
> return -1;
> }
>
> + /* Set num_active_tx_pools early. If we fail below after partial
> + * allocation, release_tx_pools() will know how many to look for.
> + */
> adapter->num_active_tx_pools = tx_subcrqs;
>
> for (i = 0; i < tx_subcrqs; i++) {
> buff_size = adapter->req_mtu + VLAN_HLEN;
> buff_size = ALIGN(buff_size, L1_CACHE_BYTES);
> +
> + dev_dbg(dev, "Init tx pool %d [%llu, %llu]\n",
> + i, adapter->req_tx_entries_per_subcrq, buff_size);
> +
> rc = init_one_tx_pool(netdev, &adapter->tx_pool[i],
> adapter->req_tx_entries_per_subcrq,
> buff_size);
> @@ -4774,9 +4801,10 @@ static void handle_query_map_rsp(union
> ibmvnic_crq *crq,
> dev_err(dev, "Error %ld in QUERY_MAP_RSP\n", rc);
> return;
> }
> - netdev_dbg(netdev, "page_size = %d\ntot_pages = %d\nfree_pages =
> %d\n",
> - crq->query_map_rsp.page_size, crq->query_map_rsp.tot_pages,
> - crq->query_map_rsp.free_pages);
> + netdev_dbg(netdev, "page_size = %d\ntot_pages = %u\nfree_pages =
> %u\n",
> + crq->query_map_rsp.page_size,
> + __be32_to_cpu(crq->query_map_rsp.tot_pages),
> + __be32_to_cpu(crq->query_map_rsp.free_pages));
> }
>
> static void handle_query_cap_rsp(union ibmvnic_crq *crq,
next prev parent reply other threads:[~2021-09-01 1:28 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-01 0:08 [PATCH net-next 0/9] ibmvnic: Reuse ltb, rx, tx pools Sukadev Bhattiprolu
2021-09-01 0:08 ` [PATCH net-next 1/9] ibmvnic: Consolidate code in replenish_rx_pool() Sukadev Bhattiprolu
2021-09-01 1:26 ` Dany Madden
2021-09-01 0:08 ` [PATCH net-next 2/9] ibmvnic: Fix up some comments and messages Sukadev Bhattiprolu
2021-09-01 1:28 ` Dany Madden [this message]
2021-09-01 8:58 ` kernel test robot
2021-09-01 0:08 ` [PATCH net-next 3/9] ibmvnic: Use/rename local vars in init_rx_pools Sukadev Bhattiprolu
2021-09-01 1:28 ` Dany Madden
2021-09-01 0:08 ` [PATCH net-next 4/9] ibmvnic: Use/rename local vars in init_tx_pools Sukadev Bhattiprolu
2021-09-01 1:30 ` Dany Madden
2021-09-01 0:08 ` [PATCH net-next 5/9] ibmvnic: init_tx_pools move loop-invariant code out Sukadev Bhattiprolu
2021-09-01 1:32 ` Dany Madden
2021-09-01 0:08 ` [PATCH net-next 6/9] ibmvnic: Use bitmap for LTB map_ids Sukadev Bhattiprolu
2021-09-01 1:33 ` Dany Madden
2021-09-01 0:08 ` [PATCH net-next 7/9] ibmvnic: Reuse LTB when possible Sukadev Bhattiprolu
2021-09-01 1:34 ` Dany Madden
2021-09-01 0:08 ` [PATCH net-next 8/9] ibmvnic: Reuse rx pools " Sukadev Bhattiprolu
2021-09-01 1:35 ` Dany Madden
2021-09-01 0:08 ` [PATCH net-next 9/9] ibmvnic: Reuse tx " Sukadev Bhattiprolu
2021-09-01 1:36 ` Dany Madden
2021-09-01 1:21 ` [PATCH net-next 0/9] ibmvnic: Reuse ltb, rx, tx pools Rick Lindsley
2021-09-01 2:35 ` Jakub Kicinski
2021-09-01 18:07 ` Sukadev Bhattiprolu
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=ef067dcb0cf71def84658c3e405c7fb2@imap.linux.ibm.com \
--to=drt@linux$(echo .)ibm.com \
--cc=brking@linux$(echo .)ibm.com \
--cc=cforno12@linux$(echo .)ibm.com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=ricklind@linux$(echo .)ibm.com \
--cc=sukadev@linux$(echo .)ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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