Skip to content

Commit eaea513

Browse files
wxiong66martinkpetersen
authored andcommitted
scsi: qla2xxx: Enable/disable IRQD_NO_BALANCING during reset
A dynamic remove/add storage adapter test hits EEH on PowerPC: EEH: [c00000000004f77c] __eeh_send_failure_event+0x7c/0x160 EEH: [c000000000048464] eeh_dev_check_failure.part.0+0x254/0x660 EEH: [c000000000934e0c] __pci_read_msi_msg+0x1ac/0x280 EEH: [c000000000100f68] pseries_msi_compose_msg+0x28/0x40 EEH: [c00000000020e1cc] irq_chip_compose_msi_msg+0x5c/0x90 EEH: [c000000000214b1c] msi_domain_set_affinity+0xbc/0x100 EEH: [c000000000206be4] irq_do_set_affinity+0x214/0x2c0 EEH: [c000000000206e04] irq_set_affinity_locked+0x174/0x230 EEH: [c000000000207044] irq_set_affinity+0x64/0xa0 EEH: [c000000000212890] write_irq_affinity.constprop.0.isra.0+0x130/0x150 EEH: [c00000000068868c] proc_reg_write+0xfc/0x160 EEH: [c0000000005adb48] vfs_write+0xf8/0x4e0 EEH: [c0000000005ae234] ksys_write+0x84/0x140 EEH: [c00000000002e994] system_call_exception+0x164/0x310 EEH: [c00000000000bfe8] system_call_vectored_common+0xe8/0x278 The irqbalance daemon kicks in before invoking qla2xxx->slot_reset during the EEH recovery process. irqbalance daemon ->irq_set_affinity() ->msi_domain_set_affinity() ->irq_chip_set_affiinity_parent() ->xive_irq_set_affinity() ->pseries_msi_compose_ms() ->__pci_read_msi_msg() ->irq_chip_compose_msi_msg() In __pci_read_msi_msg(), the first MSI-X vector is set to all F by the irqbalance daemon. pci_write_msg_msix: index=0, lo=ffffffff hi=fffffff IRQ balancing is not required during adapter reset. Enable "IRQ_NO_BALANCING" bit before starting adapter reset and disable it calling pci_restore_state(). The irqbalance daemon is disabled for this short period of time (~2s). Co-developed-by: Kyle Mahlkuch <Kyle.Mahlkuch@ibm.com> Signed-off-by: Kyle Mahlkuch <Kyle.Mahlkuch@ibm.com> Signed-off-by: Wen Xiong <wenxiong@linux.ibm.com> Link: https://patch.msgid.link/20251028142427.3969819-3-wenxiong@linux.ibm.com Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 6ac3484 commit eaea513

1 file changed

Lines changed: 30 additions & 0 deletions

File tree

drivers/scsi/qla2xxx/qla_os.c

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <linux/crash_dump.h>
1818
#include <linux/trace_events.h>
1919
#include <linux/trace.h>
20+
#include <linux/irq.h>
2021

2122
#include <scsi/scsi_tcq.h>
2223
#include <scsi/scsicam.h>
@@ -7776,6 +7777,31 @@ static void qla_pci_error_cleanup(scsi_qla_host_t *vha)
77767777
}
77777778

77787779

7780+
/**
7781+
* qla2xxx_set_affinity_nobalance
7782+
* @pdev: pci_dev struct for a qla2xxx device
7783+
* @flag: bool
7784+
* true: enable "IRQ_NO_BALANCING" bit for msix interrupt
7785+
* false: disable "IRQ_NO_BALANCING" bit for msix interrupt
7786+
* Description: This function will be called to disable/enable
7787+
* "IRQ_NO_BALANCING" to avoid irqbalance daemon
7788+
* kicking in during adapter reset.
7789+
**/
7790+
7791+
static void qla2xxx_set_affinity_nobalance(struct pci_dev *pdev, bool flag)
7792+
{
7793+
int irq, i;
7794+
7795+
for (i = 0; i < QLA_BASE_VECTORS; i++) {
7796+
irq = pci_irq_vector(pdev, i);
7797+
7798+
if (flag)
7799+
irq_set_status_flags(irq, IRQ_NO_BALANCING);
7800+
else
7801+
irq_clear_status_flags(irq, IRQ_NO_BALANCING);
7802+
}
7803+
}
7804+
77797805
static pci_ers_result_t
77807806
qla2xxx_pci_error_detected(struct pci_dev *pdev, pci_channel_state_t state)
77817807
{
@@ -7794,6 +7820,8 @@ qla2xxx_pci_error_detected(struct pci_dev *pdev, pci_channel_state_t state)
77947820
goto out;
77957821
}
77967822

7823+
qla2xxx_set_affinity_nobalance(pdev, false);
7824+
77977825
switch (state) {
77987826
case pci_channel_io_normal:
77997827
qla_pci_set_eeh_busy(vha);
@@ -7935,6 +7963,8 @@ qla2xxx_pci_slot_reset(struct pci_dev *pdev)
79357963
ql_dbg(ql_dbg_aer, base_vha, 0x900e,
79367964
"Slot Reset returning %x.\n", ret);
79377965

7966+
qla2xxx_set_affinity_nobalance(pdev, true);
7967+
79387968
return ret;
79397969
}
79407970

0 commit comments

Comments
 (0)