From: Divy Le Ray <divy@chelsio.com>
To: Roland Dreier <rdreier@cisco.com>
Cc: "David S. Miller" <davem@davemloft.net>, netdev@vger.kernel.org
Subject: Re: [PATCH for 2.6.31] cxgb3: Fix crash caused by stashing wrong netdev_queue
Date: Thu, 09 Jul 2009 14:15:21 -0700 [thread overview]
Message-ID: <4A565DE9.3040504@chelsio.com> (raw)
In-Reply-To: <adabpnty7qm.fsf_-_@cisco.com>
Roland Dreier wrote:
> Commit c3a8c5b6 ("cxgb3: move away from LLTX") exposed a bug in how
> cxgb3 looks up the netdev_queue it stashes away in a qset during
> initialization. For multiport devices, the TX queue index it uses is
> offset by the first_qset index of each port. This leads to a crash
> once LLTX is removed, since hard_start_xmit is called with one TX
> queue lock held, while the TX reclaim timer task grabs a different
> (wrong) TX queue lock when it frees skbs.
>
> Fix this by removing the first_qset offset used to look up the TX
> queue passed into t3_sge_alloc_qset() from setup_sge_qsets().
>
Thanks Roland!
You were very fast to fix it, you beat us.
Acked-by: Divy Le Ray <divy@chelsio.com>
> Signed-off-by: Roland Dreier <rolandd@cisco.com>
> ---
> OK, found the bug that was causing the crash I saw. With this patch
> everything looks solid again. Please apply.
>
> drivers/net/cxgb3/cxgb3_main.c | 3 +--
> 1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
> index 538dda4..fb5df5c 100644
> --- a/drivers/net/cxgb3/cxgb3_main.c
> +++ b/drivers/net/cxgb3/cxgb3_main.c
> @@ -642,8 +642,7 @@ static int setup_sge_qsets(struct adapter *adap)
> struct port_info *pi = netdev_priv(dev);
>
> pi->qs = &adap->sge.qs[pi->first_qset];
> - for (j = pi->first_qset; j < pi->first_qset + pi->nqsets;
> - ++j, ++qset_idx) {
> + for (j = 0; j < pi->nqsets; ++j, ++qset_idx) {
> set_qset_lro(dev, qset_idx, pi->rx_offload & T3_LRO);
> err = t3_sge_alloc_qset(adap, qset_idx, 1,
> (adap->flags & USING_MSIX) ? qset_idx + 1 :
>
next prev parent reply other threads:[~2009-07-09 21:15 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-08 22:44 Hitting slab BUG with bridging/cxgb3 on 2.6.31-rc2 Roland Dreier
2009-07-09 0:12 ` Roland Dreier
2009-07-09 0:32 ` Roland Dreier
2009-07-09 1:38 ` Divy Le Ray
2009-07-09 5:24 ` Roland Dreier
2009-07-09 5:38 ` Roland Dreier
2009-07-09 19:30 ` [PATCH for 2.6.31] cxgb3: Fix crash caused by stashing wrong netdev_queue Roland Dreier
2009-07-09 21:15 ` Divy Le Ray [this message]
2009-07-09 23:16 ` Roland Dreier
2009-07-10 0:16 ` 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=4A565DE9.3040504@chelsio.com \
--to=divy@chelsio.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=rdreier@cisco.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).