From: Jacob Keller <jacob.e.keller@intel.com>
To: Manoj Vishwanathan <manojvishy@google.com>,
Tony Nguyen <anthony.l.nguyen@intel.com>,
Przemek Kitszel <przemyslaw.kitszel@intel.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
<intel-wired-lan@lists.osuosl.org>
Cc: netdev@vger.kernel.org, David Decotigny <decot@google.com>,
linux-kernel@vger.kernel.org,
google-lan-reviews@googlegroups.com
Subject: Re: [Intel-wired-lan] [[PATCH v2 iwl-next] v2 1/4] idpf: address an rtnl lock splat in tx timeout recovery path
Date: Wed, 28 Aug 2024 14:28:14 -0700 [thread overview]
Message-ID: <d28b51be-4efb-4479-bb26-7f58c8251182@intel.com> (raw)
In-Reply-To: <20240826181032.3042222-2-manojvishy@google.com>
On 8/26/2024 11:10 AM, Manoj Vishwanathan wrote:
> From: David Decotigny <decot@google.com>
>
> Adopt the same pattern as in other places in the code to take the rtnl
> lock during hard resets.
> Tested the patch by injecting tx timeout in IDPF , observe that idpf
> recovers and IDPF comes back reachable
>
> Without this patch causes there is a splat:
> [ 270.145214] WARNING: CPU: PID: at net/sched/sch_generic.c:534 dev_watchdog
>
> Fixes: d4d5587182664 (idpf: initialize interrupts and enable vport)
> Signed-off-by: Manoj Vishwanathan <manojvishy@google.com>
> ---
> drivers/net/ethernet/intel/idpf/idpf_txrx.c | 14 +++++++++++++-
> 1 file changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/intel/idpf/idpf_txrx.c b/drivers/net/ethernet/intel/idpf/idpf_txrx.c
> index af2879f03b8d..806a8b6ea5c5 100644
> --- a/drivers/net/ethernet/intel/idpf/idpf_txrx.c
> +++ b/drivers/net/ethernet/intel/idpf/idpf_txrx.c
> @@ -4326,6 +4326,7 @@ int idpf_vport_intr_alloc(struct idpf_vport *vport)
> */
> int idpf_vport_intr_init(struct idpf_vport *vport)
> {
> + bool hr_reset_in_prog;
> char *int_name;
> int err;
>
> @@ -4334,8 +4335,19 @@ int idpf_vport_intr_init(struct idpf_vport *vport)
> return err;
>
> idpf_vport_intr_map_vector_to_qs(vport);
> + /**
> + * If we're in normal up path, the stack already takes the
> + * rtnl_lock for us, however, if we're doing up as a part of a
> + * hard reset, we'll need to take the lock ourself before
> + * touching the netdev.
> + */
> + hr_reset_in_prog = test_bit(IDPF_HR_RESET_IN_PROG,
> + vport->adapter->flags);
> + if (hr_reset_in_prog)
> + rtnl_lock();
> idpf_vport_intr_napi_add_all(vport);
> -
> + if (hr_reset_in_prog)
> + rtnl_unlock();
This feels a little fragile. Why not pass the reset in progress as a
flag from the caller? Surely the caller knows whether this is happening
due to an interface up or due to a reset?
next prev parent reply other threads:[~2024-08-28 21:28 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-26 18:10 [Intel-wired-lan] [[PATCH v2 iwl-next] v2 0/4] Manoj Vishwanathan
2024-08-26 18:10 ` [Intel-wired-lan] [[PATCH v2 iwl-next] v2 1/4] idpf: address an rtnl lock splat in tx timeout recovery path Manoj Vishwanathan
2024-08-28 21:28 ` Jacob Keller [this message]
2024-08-26 18:10 ` [Intel-wired-lan] [[PATCH v2 iwl-next] v2 2/4] idpf: Acquire the lock before accessing the xn->salt Manoj Vishwanathan
2024-08-28 21:29 ` Jacob Keller
2024-08-30 6:04 ` Przemek Kitszel
2024-08-30 21:31 ` Keller, Jacob E
2024-08-29 15:54 ` Linga, Pavan Kumar
2024-08-26 18:10 ` [Intel-wired-lan] [[PATCH v2 iwl-next] v2 3/4] idpf: convert workqueues to unbound Manoj Vishwanathan
2024-08-28 22:02 ` Jacob Keller
2024-08-29 16:02 ` Linga, Pavan Kumar
2024-08-26 18:10 ` [Intel-wired-lan] [[PATCH v2 iwl-next] v2 4/4] idpf: add more info during virtchnl transaction time out Manoj Vishwanathan
2024-08-28 22:03 ` Jacob Keller
2024-08-29 16:07 ` Linga, Pavan Kumar
2024-08-29 20:11 ` [Intel-wired-lan] [[PATCH v2 iwl-next] v2 0/4] Tony Nguyen
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=d28b51be-4efb-4479-bb26-7f58c8251182@intel.com \
--to=jacob.e.keller@intel.com \
--cc=anthony.l.nguyen@intel.com \
--cc=davem@davemloft.net \
--cc=decot@google.com \
--cc=edumazet@google.com \
--cc=google-lan-reviews@googlegroups.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=manojvishy@google.com \
--cc=netdev@vger.kernel.org \
--cc=przemyslaw.kitszel@intel.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