From: "Tantilov, Emil S" <emil.s.tantilov@intel.com>
To: Simon Horman <horms@kernel.org>
Cc: <willemb@google.com>, <pabeni@redhat.com>,
<netdev@vger.kernel.org>, <yuma@redhat.com>,
<Aleksandr.Loktionov@intel.com>, <edumazet@google.com>,
<madhu.chittim@intel.com>, <anthony.l.nguyen@intel.com>,
<kuba@kernel.org>, <intel-wired-lan@lists.osuosl.org>,
<decot@google.com>, <davem@davemloft.net>,
Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Subject: Re: [Intel-wired-lan] [PATCH iwl-net] idpf: fix adapter NULL pointer dereference on reboot
Date: Mon, 10 Mar 2025 21:42:28 -0700 [thread overview]
Message-ID: <9d84cc79-2990-49dd-a528-3d6d182ea2e9@intel.com> (raw)
In-Reply-To: <20250310062229.GD4159220@kernel.org>
On 3/9/2025 11:22 PM, Simon Horman wrote:
> On Thu, Mar 06, 2025 at 04:39:56PM -0800, Emil Tantilov wrote:
>> Driver calls idpf_remove() from idpf_shutdown(), which can end up
>> calling idpf_remove() again when disabling SRIOV.
>>
>> echo 1 > /sys/class/net/<netif>/device/sriov_numvfs
>> reboot
>>
>> BUG: kernel NULL pointer dereference, address: 0000000000000020
>> ...
>> RIP: 0010:idpf_remove+0x22/0x1f0 [idpf]
>> ...
>> ? idpf_remove+0x22/0x1f0 [idpf]
>> ? idpf_remove+0x1e4/0x1f0 [idpf]
>> pci_device_remove+0x3f/0xb0
>> device_release_driver_internal+0x19f/0x200
>> pci_stop_bus_device+0x6d/0x90
>> pci_stop_and_remove_bus_device+0x12/0x20
>> pci_iov_remove_virtfn+0xbe/0x120
>> sriov_disable+0x34/0xe0
>> idpf_sriov_configure+0x58/0x140 [idpf]
>> idpf_remove+0x1b9/0x1f0 [idpf]
>> idpf_shutdown+0x12/0x30 [idpf]
>> pci_device_shutdown+0x35/0x60
>> device_shutdown+0x156/0x200
>> ...
>>
>> Replace the direct idpf_remove() call in idpf_shutdown() with
>> idpf_vc_core_deinit() and idpf_deinit_dflt_mbx(), which perform
>> the bulk of the cleanup, such as stopping the init task, freeing IRQs,
>> destroying the vports and freeing the mailbox.
>
> Hi Emil,
>
> I think it would be worth adding some commentary on the rest of
> the clean-up performed by idpf_remove() and why it is correct
The main reason behind the change is to avoid calling sriov_disable(),
which ends up calling idpf_remove() again via pci_device_remove(). The
idpf_remove() will crash in that situation as it attempts to access
adapter pointer, which was already freed.
> to no longer do so directly from a call to idpf_remove() from
> idpf_shutdown() (IOW, it isn't clear to me :).
I assume you are asking what portion of the idpf_remove() will not be
present in idpf_shutdown() as result? Aside from not calling
sriov_disable(), there is a small cleanup of stale netdevs and the
destruction of WQs, which did not seem like would be needed on shutdown.
Then again, I was not able to find documentation on what steps are
required for shutdown and mostly checked on how other drivers handle it
(where there is no 1:1 overlap between shutdown and remove), and applied
similar steps to idpf. Ideally I do not wish to do more than is needed
for that flow.
>
> ...
prev parent reply other threads:[~2025-03-11 4:43 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-07 0:39 [Intel-wired-lan] [PATCH iwl-net] idpf: fix adapter NULL pointer dereference on reboot Emil Tantilov
2025-03-07 5:58 ` Michal Swiatkowski
2025-03-11 4:52 ` Tantilov, Emil S
2025-03-10 6:22 ` Simon Horman
2025-03-11 4:42 ` Tantilov, Emil S [this message]
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=9d84cc79-2990-49dd-a528-3d6d182ea2e9@intel.com \
--to=emil.s.tantilov@intel.com \
--cc=Aleksandr.Loktionov@intel.com \
--cc=anthony.l.nguyen@intel.com \
--cc=davem@davemloft.net \
--cc=decot@google.com \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=kuba@kernel.org \
--cc=madhu.chittim@intel.com \
--cc=michal.swiatkowski@linux.intel.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=willemb@google.com \
--cc=yuma@redhat.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