From: Tony Nguyen <anthony.l.nguyen@intel.com>
To: davem@davemloft.net, kuba@kernel.org
Cc: Nicholas Nunley <nicholas.d.nunley@intel.com>,
netdev@vger.kernel.org, anthony.l.nguyen@intel.com,
sassmann@redhat.com, Tony Brelinski <tony.brelinski@intel.com>
Subject: [PATCH net 03/10] iavf: free q_vectors before queues in iavf_disable_vf
Date: Mon, 15 Nov 2021 15:59:27 -0800 [thread overview]
Message-ID: <20211115235934.880882-4-anthony.l.nguyen@intel.com> (raw)
In-Reply-To: <20211115235934.880882-1-anthony.l.nguyen@intel.com>
From: Nicholas Nunley <nicholas.d.nunley@intel.com>
iavf_free_queues() clears adapter->num_active_queues, which
iavf_free_q_vectors() relies on, so swap the order of these two function
calls in iavf_disable_vf(). This resolves a panic encountered when the
interface is disabled and then later brought up again after PF
communication is restored.
Fixes: 65c7006f234c ("i40evf: assign num_active_queues inside i40evf_alloc_queues")
Signed-off-by: Nicholas Nunley <nicholas.d.nunley@intel.com>
Tested-by: Tony Brelinski <tony.brelinski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/iavf/iavf_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c
index 561171507cda..c23fff5a4bd9 100644
--- a/drivers/net/ethernet/intel/iavf/iavf_main.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_main.c
@@ -2123,8 +2123,8 @@ static void iavf_disable_vf(struct iavf_adapter *adapter)
iavf_free_misc_irq(adapter);
iavf_reset_interrupt_capability(adapter);
- iavf_free_queues(adapter);
iavf_free_q_vectors(adapter);
+ iavf_free_queues(adapter);
memset(adapter->vf_res, 0, IAVF_VIRTCHNL_VF_RESOURCE_SIZE);
iavf_shutdown_adminq(&adapter->hw);
adapter->netdev->flags &= ~IFF_UP;
--
2.31.1
next prev parent reply other threads:[~2021-11-16 0:03 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-15 23:59 [PATCH net 00/10][pull request] Intel Wired LAN Driver Updates 2021-11-15 Tony Nguyen
2021-11-15 23:59 ` [PATCH net 01/10] iavf: Fix return of set the new channel count Tony Nguyen
2021-11-16 7:07 ` Stefan Assmann
2021-11-15 23:59 ` [PATCH net 02/10] iavf: check for null in iavf_fix_features Tony Nguyen
2021-11-15 23:59 ` Tony Nguyen [this message]
2021-11-15 23:59 ` [PATCH net 04/10] iavf: don't clear a lock we don't hold Tony Nguyen
2021-11-15 23:59 ` [PATCH net 05/10] iavf: Fix failure to exit out from last all-multicast mode Tony Nguyen
2021-11-15 23:59 ` [PATCH net 06/10] iavf: prevent accidental free of filter structure Tony Nguyen
2021-11-16 7:24 ` Stefan Assmann
2021-11-16 20:18 ` Keller, Jacob E
2021-11-17 6:37 ` Stefan Assmann
2021-11-15 23:59 ` [PATCH net 07/10] iavf: validate pointers Tony Nguyen
2021-11-15 23:59 ` [PATCH net 08/10] iavf: Fix for the false positive ASQ/ARQ errors while issuing VF reset Tony Nguyen
2021-11-15 23:59 ` [PATCH net 09/10] iavf: Fix for setting queues to 0 Tony Nguyen
2021-11-15 23:59 ` [PATCH net 10/10] iavf: Restore VLAN filters after link down Tony Nguyen
2021-11-16 13:40 ` [PATCH net 00/10][pull request] Intel Wired LAN Driver Updates 2021-11-15 patchwork-bot+netdevbpf
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=20211115235934.880882-4-anthony.l.nguyen@intel.com \
--to=anthony.l.nguyen@intel.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nicholas.d.nunley@intel.com \
--cc=sassmann@redhat.com \
--cc=tony.brelinski@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