From: Nathan Chancellor <natechancellor@gmail.com>
To: "Michael S. Tsirkin" <mst@redhat.com>
Cc: linux-kernel@vger.kernel.org, Julio Faracco <jcfaracco@gmail.com>,
netdev@vger.kernel.org, davem@davemloft.net, jasowang@redhat.com,
virtualization@lists.linux-foundation.org, dnmendes76@gmail.com,
Heiner Kallweit <hkallweit1@gmail.com>,
Jakub Kicinski <jakub.kicinski@netronome.com>,
Shannon Nelson <snelson@pensando.io>,
Martin Habets <mhabets@solarflare.com>,
clang-built-linux@googlegroups.com
Subject: Re: [PATCH net-next v9 1/3] netdev: pass the stuck queue to the timeout handler
Date: Mon, 9 Dec 2019 12:34:40 -0700 [thread overview]
Message-ID: <20191209193440.GA15189@ubuntu-m2-xlarge-x86> (raw)
In-Reply-To: <20191209162727.10113-2-mst@redhat.com>
Hi Michael,
On Mon, Dec 09, 2019 at 11:29:03AM -0500, Michael S. Tsirkin wrote:
> This allows incrementing the correct timeout statistic without any mess.
> Down the road, devices can learn to reset just the specific queue.
>
> The patch was generated with the following script:
>
<snip>
>
> where the list of files and functions is simply from:
>
> git grep ndo_tx_timeout, with manual addition of headers
> in the rare cases where the function is from a header,
> then manually changing the few places which actually
> call ndo_tx_timeout.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> Acked-by: Heiner Kallweit <hkallweit1@gmail.com>
> Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>
> Acked-by: Shannon Nelson <snelson@pensando.io>
> Reviewed-by: Martin Habets <mhabets@solarflare.com>
>
> changes from v8:
> fix up a missing direct call to timeout
> rebased on net-next
> changes from v7:
> fixup leftovers from v3 change
> changes from v6:
> fix typo in rtl driver
> changes from v5:
> add missing files (allow any net device argument name)
> changes from v4:
> add a missing driver header
> changes from v3:
> change queue # to unsigned
> Changes from v2:
> added headers
> Changes from v1:
> Fix errors found by kbuild:
> generalize the pattern a bit, to pick up
> a couple of instances missed by the previous
> version.
> ---
<snip>
> diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
> index 6a9d12dad5d9..ad0ecebb1b34 100644
> --- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
> +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
> @@ -288,7 +288,7 @@ static int dpaa_stop(struct net_device *net_dev)
> return err;
> }
>
> -static void dpaa_tx_timeout(struct net_device *net_dev)
> +static void dpaa_tx_timeout(struct net_device *net_dev, int txqueue)
This needs to be unsigned int, otherwise there is a build error:
../drivers/net/ethernet/freescale/dpaa/dpaa_eth.c:2622:20: error: incompatible pointer types initializing 'void (*)(struct net_device *, unsigned int)' with an expression of type 'void (struct net_device *, int)' [-Werror,-Wincompatible-pointer-types]
.ndo_tx_timeout = dpaa_tx_timeout,
^~~~~~~~~~~~~~~
1 error generated.
Cheers,
Nathan
next prev parent reply other threads:[~2019-12-09 19:34 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-09 16:28 [PATCH net-next v9 0/3] netdev: ndo_tx_timeout cleanup Michael S. Tsirkin
2019-12-09 16:29 ` [PATCH net-next v9 1/3] netdev: pass the stuck queue to the timeout handler Michael S. Tsirkin
2019-12-09 19:34 ` Nathan Chancellor [this message]
2019-12-09 16:29 ` [PATCH net-next v9 3/3] netronome: use the new txqueue timeout argument Michael S. Tsirkin
2019-12-09 16:29 ` Michael S. Tsirkin
2019-12-09 22:43 ` [PATCH net-next v9 0/3] netdev: ndo_tx_timeout cleanup David Miller
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=20191209193440.GA15189@ubuntu-m2-xlarge-x86 \
--to=natechancellor@gmail.com \
--cc=clang-built-linux@googlegroups.com \
--cc=davem@davemloft.net \
--cc=dnmendes76@gmail.com \
--cc=hkallweit1@gmail.com \
--cc=jakub.kicinski@netronome.com \
--cc=jasowang@redhat.com \
--cc=jcfaracco@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mhabets@solarflare.com \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=snelson@pensando.io \
--cc=virtualization@lists.linux-foundation.org \
/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).