mpi3mr: Support PCI Error Recovery
Subsystems (3)
Sumit Saxena
maintainerv5 cover mpi3mr: Support PCI Error Recovery
This patch series contains the changes done in the driver to support PCI error recovery. It is rework of older patch series from Ranjan Kumar, see [1].
[1] https://lore.kernel.org/all/[email protected]/
v1->v2:
- AER patch split as suggested by Bjorn Helgaas.
- Updated driver version to a new value.
v2->v3:
- Addressed the feedback from Bjorn Helgaas.
- Simplified and dropped few patches.
v3->v4:
- Addressed the feedback from Bjorn Helgaas about dropping null pointer checks for shost and mrioc.
v3->v5:
- Replace sprintf with sysfs_emit and simplification in adp_state_show().
Sumit Saxena (3):
mpi3mr: Support PCI Error Recovery callback handlers
mpi3mr: Prevent PCI writes from driver during PCI error recovery
mpi3mr: driver version update
drivers/scsi/mpi3mr/mpi3mr.h | 11 +- drivers/scsi/mpi3mr/mpi3mr_app.c | 10 +- drivers/scsi/mpi3mr/mpi3mr_fw.c | 22 ++- drivers/scsi/mpi3mr/mpi3mr_os.c | 248 ++++++++++++++++++++++++- drivers/scsi/mpi3mr/mpi3mr_transport.c | 39 +++- 5 files changed, 311 insertions(+), 19 deletions(-)
Signature · 1 line
2.31.1
Sumit Saxena
maintainerPATCH v5 1/3 mpi3mr: Support PCI Error Recovery callback handlers
PCI Error recovery support is required to recover the controller upon detection of PCI errors. Add support for the PCI error recovery callback handlers in mpi3mr driver.
--- drivers/scsi/mpi3mr/mpi3mr.h | 6 + drivers/scsi/mpi3mr/mpi3mr_os.c | 199 ++++++++++++++++++++++++++++++++ 2 files changed, 205 insertions(+)
drivers/scsi/mpi3mr/mpi3mr.h +6 -0
@@ -23,6 +23,7 @@#include <linux/miscdevice.h> #include <linux/module.h> #include <linux/pci.h> +#include <linux/aer.h> #include <linux/poll.h> #include <linux/sched.h> #include <linux/slab.h>
@@ -129,6 +130,7 @@ extern atomic64_t event_counter;#define MPI3MR_PREPARE_FOR_RESET_TIMEOUT 180#define MPI3MR_RESET_ACK_TIMEOUT 30#define MPI3MR_MUR_TIMEOUT 120 +#define MPI3MR_RESET_TIMEOUT 510#define MPI3MR_WATCHDOG_INTERVAL 1000/* in milli seconds */
@@ -1153,6 +1155,8 @@ struct scmd_priv {* @trace_release_trigger_active: Trace trigger active flag * @fw_release_trigger_active: Fw release trigger active flag * @snapdump_trigger_active: Snapdump trigger active flag +* @pci_err_recovery: PCI error recovery in progress +* @block_on_pci_err: Block IO during PCI error recovery */ struct mpi3mr_ioc {struct list_head list;
@@ -1353,6 +1357,8 @@ struct mpi3mr_ioc {bool snapdump_trigger_active;bool trace_release_trigger_active;bool fw_release_trigger_active; +bool pci_err_recovery; +bool block_on_pci_err; };/**
drivers/scsi/mpi3mr/mpi3mr_os.c +199 -0
217 lines not on this page · raw message
Signature · 1 line
2.31.1
Sumit Saxena
maintainerPATCH v5 2/3 mpi3mr: Prevent PCI writes from driver during PCI error recovery
In reply to Sumit SaxenaPrevent interaction with the hardware while the error recovery in progress.
--- drivers/scsi/mpi3mr/mpi3mr.h | 1 + drivers/scsi/mpi3mr/mpi3mr_app.c | 10 ++++-- drivers/scsi/mpi3mr/mpi3mr_fw.c | 22 +++++++++--- drivers/scsi/mpi3mr/mpi3mr_os.c | 49 +++++++++++++++++++++++--- drivers/scsi/mpi3mr/mpi3mr_transport.c | 39 +++++++++++++++++--- 5 files changed, 104 insertions(+), 17 deletions(-)
drivers/scsi/mpi3mr/mpi3mr.h +1 -0
@@ -519,6 +519,7 @@ struct mpi3mr_throttle_group_info {/* HBA port flags */ #define MPI3MR_HBA_PORT_FLAG_DIRTY 0x01 +#define MPI3MR_HBA_PORT_FLAG_NEW 0x02/* IOCTL data transfer sge*/ #define MPI3MR_NUM_IOCTL_SGE 256
drivers/scsi/mpi3mr/mpi3mr_app.c +7 -3
@@ -846,7 +846,7 @@ static int mpi3mr_bsg_pel_abort(struct mpi3mr_ioc *mrioc)dprint_bsg_err (mrioc,"%s: reset in progress\n" , __func__);return -1 ; } -if (mrioc->stop_bsgs) { +if (mrioc->stop_bsgs || mrioc->block_on_pci_err) {dprint_bsg_err (mrioc,"%s: bsgs are blocked\n" , __func__);return -1 ; }
@@ -1492,6 +1492,9 @@ static long mpi3mr_bsg_adp_reset(struct mpi3mr_ioc *mrioc, goto out; } +if (mrioc->unrecoverable || mrioc->block_on_pci_err) +return -EINVAL ; +sg_copy_to_buffer (job->request_payload.sg_list, job->request_payload.sg_cnt, &adpreset,sizeof (adpreset));
@@ -2575,7 +2578,7 @@ static long mpi3mr_bsg_process_mpt_cmds(struct bsg_job *job)mutex_unlock (&mrioc->bsg_cmds.mutex); goto out; } -if (mrioc->stop_bsgs) { +if (mrioc->stop_bsgs || mrioc->block_on_pci_err) {dprint_bsg_err (mrioc,"%s: bsgs are blocked\n" , __func__); rval = -EAGAIN ;mutex_unlock (&mrioc->bsg_cmds.mutex);
@@ -3108,7 +3111,8 @@ adp_state_show(struct device *dev, struct device_attribute *attr, ioc_state =mpi3mr_get_iocstate (mrioc);if (ioc_state ==MRIOC_STATE_UNRECOVERABLE ) adp_state =MPI3MR_BSG_ADPSTATE_UNRECOVERABLE ; -else if ((mrioc->reset_in_progress) || (mrioc->stop_bsgs)) +else if (mrioc->reset_in_progress || mrioc->stop_bsgs || + mrioc->block_on_pci_err) adp_state =MPI3MR_BSG_ADPSTATE_IN_RESET ;else if (ioc_state ==MRIOC_STATE_FAULT ) adp_state =MPI3MR_BSG_ADPSTATE_FAULT ;
drivers/scsi/mpi3mr/mpi3mr_fw.c +17 -5
@@ -608,7 +608,7 @@ int mpi3mr_blk_mq_poll(struct Scsi_Host *shost, unsigned int queue_num) mrioc = (struct mpi3mr_ioc *)shost->hostdata;if ((mrioc->reset_in_progress || mrioc->prepare_for_reset || - mrioc->unrecoverable)) + mrioc->unrecoverable || mrioc->pci_err_recovery))return 0 ; num_entries = mpi3mr_process_op_reply_q(mrioc,
@@ -1693,6 +1693,12 @@ int mpi3mr_admin_request_post(struct mpi3mr_ioc *mrioc, void *admin_req, retval = -EAGAIN ; goto out; } +if (mrioc->pci_err_recovery) { +ioc_err (mrioc,"admin request queue submission failed due to pci error recovery in progress\n" ); + retval = -EAGAIN ; + goto out; + } + areq_entry = (u8 *)mrioc->admin_req_base + (areq_pi *MPI3MR_ADMIN_REQ_FRAME_SZ );memset (areq_entry,0 ,MPI3MR_ADMIN_REQ_FRAME_SZ );
@@ -2363,6 +2369,11 @@ int mpi3mr_op_request_post(struct mpi3mr_ioc *mrioc, retval = -EAGAIN ; goto out; } +if (mrioc->pci_err_recovery) { +ioc_err (mrioc,"operational request queue submission failed due to pci error recovery in progress\n" ); + retval = -EAGAIN ; + goto out; + } segment_base_addr = segments[pi / op_req_q->segment_qd].segment; req_entry = (u8 *)segment_base_addr +
@@ -2627,7 +2638,7 @@ static void mpi3mr_watchdog_work(struct work_struct *work)union mpi3mr_trigger_data trigger_data;u16 reset_reason =MPI3MR_RESET_FROM_FAULT_WATCH ; -if (mrioc->reset_in_progress) +if (mrioc->reset_in_progress || mrioc->pci_err_recovery)return ;if (!mrioc->unrecoverable && !pci_device_is_present (mrioc->pdev)) {
@@ -4268,7 +4279,7 @@ int mpi3mr_reinit_ioc(struct mpi3mr_ioc *mrioc, u8 is_resume) goto out_failed_noretry; } -if (is_resume) { +if (is_resume || mrioc->block_on_pci_err) {dprint_reset (mrioc,"setting up single ISR\n" ); retval =mpi3mr_setup_isr (mrioc,1 );if (retval) {
@@ -4319,7 +4330,7 @@ int mpi3mr_reinit_ioc(struct mpi3mr_ioc *mrioc, u8 is_resume) goto out_failed; } -if (is_resume) { +if (is_resume || mrioc->block_on_pci_err) {dprint_reset (mrioc,"setting up multiple ISR\n" ); retval =mpi3mr_setup_isr (mrioc,0 );if (retval) {
@@ -4807,7 +4818,8 @@ void mpi3mr_cleanup_ioc(struct mpi3mr_ioc *mrioc) ioc_state =mpi3mr_get_iocstate (mrioc); -if ((!mrioc->unrecoverable) && (!mrioc->reset_in_progress) && +if (!mrioc->unrecoverable && !mrioc->reset_in_progress && + !mrioc->pci_err_recovery && (ioc_state ==MRIOC_STATE_READY )) {if (mpi3mr_issue_and_process_mur (mrioc,MPI3MR_RESET_FROM_CTLR_CLEANUP ))
drivers/scsi/mpi3mr/mpi3mr_os.c +44 -5
103 lines not on this page · raw message
drivers/scsi/mpi3mr/mpi3mr_transport.c +35 -4
@@ -151,6 +151,11 @@ static int mpi3mr_report_manufacture(struct mpi3mr_ioc *mrioc,return -EFAULT ; } +if (mrioc->pci_err_recovery) { +ioc_err (mrioc,"%s: pci error recovery in progress!\n" , __func__); +return -EFAULT ; + } + data_out_sz =sizeof (struct rep_manu_request ); data_in_sz =sizeof (struct rep_manu_reply ); data_out = dma_alloc_coherent(&mrioc->pdev->dev,
@@ -790,6 +795,12 @@ static int mpi3mr_set_identify(struct mpi3mr_ioc *mrioc, u16 handle,return -EFAULT ; } +if (mrioc->pci_err_recovery) { +ioc_err (mrioc,"%s: pci error recovery in progress!\n" , + __func__); +return -EFAULT ; + } +if ((mpi3mr_cfg_get_dev_pg0 (mrioc, &ioc_status, &device_pg0,sizeof (device_pg0),MPI3_DEVICE_PGAD_FORM_HANDLE , handle))) {ioc_err (mrioc,"%s: device page0 read failed\n" , __func__);
@@ -1007,6 +1018,9 @@ mpi3mr_alloc_hba_port(struct mpi3mr_ioc *mrioc, u16 port_id) hba_port->port_id = port_id;ioc_info (mrioc,"hba_port entry: %p, port: %d is added to hba_port list\n" , hba_port, hba_port->port_id); +if (mrioc->reset_in_progress || + mrioc->pci_err_recovery) + hba_port->flags =MPI3MR_HBA_PORT_FLAG_NEW ;list_add_tail (&hba_port->list, &mrioc->hba_port_table_list);return hba_port; }
@@ -1055,7 +1069,7 @@ void mpi3mr_update_links(struct mpi3mr_ioc *mrioc,struct mpi3mr_sas_node *mr_sas_node;struct mpi3mr_sas_phy *mr_sas_phy; -if (mrioc->reset_in_progress) +if (mrioc->reset_in_progress || mrioc->pci_err_recovery)return ;spin_lock_irqsave (&mrioc->sas_node_lock, flags);
@@ -1978,7 +1992,7 @@ int mpi3mr_expander_add(struct mpi3mr_ioc *mrioc, u16 handle)if (!handle)return -1 ; -if (mrioc->reset_in_progress) +if (mrioc->reset_in_progress || mrioc->pci_err_recovery)return -1 ; if ((mpi3mr_cfg_get_sas_exp_pg0(mrioc, &ioc_status, &expander_pg0,
@@ -2184,7 +2198,7 @@ void mpi3mr_expander_node_remove(struct mpi3mr_ioc *mrioc,/* remove sibling ports attached to this expander */ list_for_each_entry_safe (mr_sas_port, next, &sas_expander->sas_port_list, port_list) { -if (mrioc->reset_in_progress) +if (mrioc->reset_in_progress || mrioc->pci_err_recovery)return ;if (mr_sas_port->remote_identify.device_type ==SAS_END_DEVICE )
@@ -2234,7 +2248,7 @@ void mpi3mr_expander_remove(struct mpi3mr_ioc *mrioc, u64 sas_address,struct mpi3mr_sas_node *sas_expander;unsigned long flags; -if (mrioc->reset_in_progress) +if (mrioc->reset_in_progress || mrioc->pci_err_recovery)return ;if (!hba_port)
@@ -2545,6 +2559,11 @@ static int mpi3mr_get_expander_phy_error_log(struct mpi3mr_ioc *mrioc,return -EFAULT ; } +if (mrioc->pci_err_recovery) { +ioc_err (mrioc,"%s: pci error recovery in progress!\n" , __func__); +return -EFAULT ; + } + data_out_sz =sizeof (struct phy_error_log_request ); data_in_sz =sizeof (struct phy_error_log_reply ); sz = data_out_sz + data_in_sz;
@@ -2804,6 +2823,12 @@ mpi3mr_expander_phy_control(struct mpi3mr_ioc *mrioc,return -EFAULT ; } +if (mrioc->pci_err_recovery) { +ioc_err (mrioc,"%s: pci error recovery in progress!\n" , + __func__); +return -EFAULT ; + } + data_out_sz =sizeof (struct phy_control_request ); data_in_sz =sizeof (struct phy_control_reply ); sz = data_out_sz + data_in_sz;
@@ -3227,6 +3252,12 @@ mpi3mr_transport_smp_handler(struct bsg_job *job, struct Scsi_Host *shost, goto out; } +if (mrioc->pci_err_recovery) { +ioc_err (mrioc,"%s: pci error recovery in progress!\n" , __func__); + rc = -EFAULT ; + goto out; + } + rc =mpi3mr_map_smp_buffer (&mrioc->pdev->dev, &job->request_payload, &dma_addr_out, &dma_len_out, &addr_out);if (rc)
Signature · 1 line
2.31.1
Sumit Saxena
maintainerPATCH v5 3/3 mpi3mr: driver version update
In reply to Sumit Saxena--- drivers/scsi/mpi3mr/mpi3mr.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/mpi3mr/mpi3mr.h +2 -2
@@ -57,8 +57,8 @@ extern struct list_head mrioc_list;extern int prot_mask;extern atomic64_t event_counter; -#define MPI3MR_DRIVER_VERSION "8.9.1.0.50" -#define MPI3MR_DRIVER_RELDATE "14-May-2024" +#define MPI3MR_DRIVER_VERSION "8.9.1.0.51" +#define MPI3MR_DRIVER_RELDATE "29-May-2024"#define MPI3MR_DRIVER_NAME "mpi3mr"#define MPI3MR_DRIVER_LICENSE "GPL"
Signature · 1 line
2.31.1
Martin K. Petersen
AppliedSumit,
Quoted 2 lines
This patch series contains the changes done in the driver to support PCI error recovery. It is rework of older patch series from Ranjan Kumar,
Applied to 6.11/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 11 lines · Sumit Saxena
This patch series contains the changes done in the driver to support PCI error recovery. It is rework of older patch series from Ranjan Kumar, see [1].
[1] https://lore.kernel.org/all/[email protected]/
v1->v2:
- AER patch split as suggested by Bjorn Helgaas.
- Updated driver version to a new value.[...]
Applied to 6.11/scsi-queue, thanks!
[1/3] mpi3mr: Support PCI Error Recovery callback handlers
https://git.kernel.org/mkp/scsi/c/30bafe1774f0 [2/3] mpi3mr: Prevent PCI writes from driver during PCI error recovery https://git.kernel.org/mkp/scsi/c/1c342b0548e3 [3/3] mpi3mr: driver version update https://git.kernel.org/mkp/scsi/c/cf82b9e866b6
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering