On Tue, Jun 05, 2018 at 05:09:11PM -0500, Bjorn Helgaas wrote: > > @@ -796,10 +796,10 @@ void aer_isr(struct work_struct *work) > > struct aer_rpc *rpc = container_of(work, struct aer_rpc, dpc_handler); > > struct aer_err_source uninitialized_var(e_src); > > > > - mutex_lock(&rpc->rpc_mutex); > > + pci_lock_rescan_remove(); > > while (get_e_source(rpc, &e_src)) > > aer_isr_one_error(rpc, &e_src); > > - mutex_unlock(&rpc->rpc_mutex); > > + pci_unlock_rescan_remove(); > > I think this needs to be updated after Oza's patches, doesn't it? > > It looks like this would deadlock if I applied it to my current "next" > branch as-is: > > aer_isr > pci_lock_rescan_remove > aer_isr_one_error > aer_process_err_devices > handle_error_source > pcie_do_fatal_recovery > pci_lock_rescan_remove <-- deadlock > > > aer_release(rpc); > > } Yes, looks like you are right about that. I fully intended to have this rebased on that by now, but nvme issues took way more time than I anticipated. Things appear to have calmed down on that front, and I should be able to rebase appropriately this week (famous last words...).
