megaraid_sas: Update driver version to 07.717.02.00-rc1
Subsystems (3)
Chandrakanth Patil
maintainerv3 cover megaraid_sas: Update driver version to 07.717.02.00-rc1
This patchset contains few critical fixes and enhancements.
v2:
- Fixed sparse warnings reported by kbuild test robot in patch3.
v3:
- Fixed sparse warnings reported by kbuild test robot in patch4.
Chandrakanth Patil (5):
megaraid_sas: Send all non-RW IOs for TYPE_ENCLOSURE device through
firmware
megaraid_sas: Fix the resource leak in case of probe failure
megaraid_sas: Early detection of VD deletion through RaidMap update
megaraid_sas: Handle missing interrupts while re-enabling IRQs
megaraid_sas: Update driver version to 07.717.02.00-rc1
drivers/scsi/megaraid/megaraid_sas.h | 16 +++- drivers/scsi/megaraid/megaraid_sas_base.c | 96 +++++++++++++++++++-- drivers/scsi/megaraid/megaraid_sas_fp.c | 6 +- drivers/scsi/megaraid/megaraid_sas_fusion.c | 20 ++++- 4 files changed, 123 insertions(+), 15 deletions(-)
base-commit: ea2f0f77538c50739b9fb4de4700cee5535e1f77
Signature · 1 line
2.18.1
Chandrakanth Patil
maintainerPATCH v3 1/5 megaraid_sas: Send all non-RW IOs for TYPE_ENCLOSURE device through firmware
Driver issues all non-ReadWrite IOs for TYPE_ENCLOSURE devices through the fast path with invalid dev handle and fast path inturn directs all the IOs to the firmware. As firmware stopped handling those IOs from SAS3.5 generation of controllers (Ventura and its onward generations) lead to IOs failure.
The driver will issue all the non-ReadWrite IOs for TYPE_ENCLOSURE devices directly to firmware from SAS3.5 generation of controllers.
--- drivers/scsi/megaraid/megaraid_sas_fusion.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/scsi/megaraid/megaraid_sas_fusion.c +8 -2
@@ -3203,6 +3203,8 @@ megasas_build_io_fusion(struct megasas_instance *instance, {int sge_count;u8 cmd_type; +u16 pd_index =0 ; +u8 drive_type =0 ;struct MPI2_RAID_SCSI_IO_REQUEST *io_request = cmd->io_request;struct MR_PRIV_DEVICE *mr_device_priv_data; mr_device_priv_data = scp->device->hostdata;
@@ -3237,8 +3239,12 @@ megasas_build_io_fusion(struct megasas_instance *instance,megasas_build_syspd_fusion (instance, scp, cmd, true);break ;case NON_READ_WRITE_SYSPDIO : -if (instance->secure_jbod_support || - mr_device_priv_data->is_tm_capable) + pd_index =MEGASAS_PD_INDEX (scp); + drive_type = instance->pd_list[pd_index].driveType; +if ((instance->secure_jbod_support || + mr_device_priv_data->is_tm_capable) || + (instance->adapter_type >=VENTURA_SERIES && + drive_type ==TYPE_ENCLOSURE ))megasas_build_syspd_fusion (instance, scp, cmd, false);else megasas_build_syspd_fusion (instance, scp, cmd, true);
Signature · 1 line
2.18.1
Chandrakanth Patil
maintainerPATCH v3 2/5 megaraid_sas: Fix the resource leak in case of probe failure
In reply to Chandrakanth PatilDriver doesn't cleanup all the allocated resources properly when scsi_add_host(),megasas_start_aen() function fails during the PCI device probe.
This patch will cleanup all those resources.
--- drivers/scsi/megaraid/megaraid_sas_base.c | 13 +++++++++++++ drivers/scsi/megaraid/megaraid_sas_fusion.c | 1 + 2 files changed, 14 insertions(+)
drivers/scsi/megaraid/megaraid_sas_base.c +13 -0
@@ -7545,11 +7545,16 @@ static int megasas_probe_one(struct pci_dev *pdev,return 0 ; fail_start_aen: + instance->unload =1 ; +scsi_remove_host (instance->host); fail_io_attach: megasas_mgmt_info.count--; megasas_mgmt_info.max_index--; megasas_mgmt_info.instance[megasas_mgmt_info.max_index] =NULL ; +if (instance->requestorId && !instance->skip_heartbeat_timer_del) +del_timer_sync (&instance->sriov_heartbeat_timer); + instance->instancet->disable_intr (instance);megasas_destroy_irqs (instance);
@@ -7557,8 +7562,16 @@ static int megasas_probe_one(struct pci_dev *pdev,megasas_release_fusion (instance); elsemegasas_release_mfi (instance ); +if (instance->msix_vectors)pci_free_irq_vectors (instance->pdev); + instance->msix_vectors =0 ; + +if (instance->fw_crash_state !=UNAVAILABLE ) +megasas_free_host_crash_buffer (instance); + +if (instance->adapter_type !=MFI_SERIES ) +megasas_fusion_stop_watchdog (instance); fail_init_mfi:scsi_host_put (host); fail_alloc_instance:
drivers/scsi/megaraid/megaraid_sas_fusion.c +1 -0
@@ -5272,6 +5272,7 @@ megasas_alloc_fusion_context(struct megasas_instance *instance)if (!fusion->log_to_span) {dev_err (&instance->pdev->dev,"Failed from %s %d\n" , __func__, __LINE__); +kfree (instance->ctrl_context);return -ENOMEM ; } }
Signature · 1 line
2.18.1
Chandrakanth Patil
maintainerPATCH v3 3/5 megaraid_sas: Early detection of VD deletion through RaidMap update
In reply to Chandrakanth PatilConsider in a case, when a VD is deleted and the targetID of that VD is assigned to a newly created VD. If the sequence of deletion/addition of VD happens very quickly, there is a possibility that second event(VD add) occurs even before the driver processes the first event(VD delete).
As event processing is done in deferred context the device list remains same(but targetID is re-used) so driver will not learn the VD deletion/additon and IOs meant for older VD will be directed to new VD which may lead to data corruption.
In new design, driver will detect the deleted VD as soon as possible based on the RaidMap update and blocks further IOs to that device.
--- drivers/scsi/megaraid/megaraid_sas.h | 12 ++++ drivers/scsi/megaraid/megaraid_sas_base.c | 83 ++++++++++++++++++++--- drivers/scsi/megaraid/megaraid_sas_fp.c | 6 +- 3 files changed, 92 insertions(+), 9 deletions(-)
drivers/scsi/megaraid/megaraid_sas.h +12 -0
@@ -2262,6 +2262,15 @@ enum MR_PERF_MODE { (mode) == MR_LATENCY_PERF_MODE ? "Latency" : \ "Unknown") +enum MEGASAS_LD_TARGET_ID_STATUS { +LD_TARGET_ID_INITIAL , +LD_TARGET_ID_ACTIVE , +LD_TARGET_ID_DELETED , +}; + +#define MEGASAS_TARGET_ID (sdev) \ + (((sdev->channel % 2) * MEGASAS_MAX_DEV_PER_CHANNEL) + sdev->id) +struct megasas_instance {unsigned int *reply_map;
@@ -2326,6 +2335,9 @@ struct megasas_instance {struct megasas_pd_list pd_list[MEGASAS_MAX_PD ];struct megasas_pd_list local_pd_list[MEGASAS_MAX_PD ];u8 ld_ids[MEGASAS_MAX_LD_IDS ]; +u8 ld_tgtid_status[MEGASAS_MAX_LD_IDS ]; +u8 ld_ids_prev[MEGASAS_MAX_LD_IDS ]; +u8 ld_ids_from_raidmap[MEGASAS_MAX_LD_IDS ];s8 init_id;u16 max_num_sge;
drivers/scsi/megaraid/megaraid_sas_base.c +75 -8
164 lines not on this page · raw message
drivers/scsi/megaraid/megaraid_sas_fp.c +5 -1
@@ -349,6 +349,10 @@ u8 MR_ValidateMapInfo(struct megasas_instance *instance, u64 map_id) num_lds =le16_to_cpu (drv_map->raidMap.ldCount); +memcpy (instance->ld_ids_prev, + instance->ld_ids_from_raidmap, +sizeof (instance->ld_ids_from_raidmap)); +memset (instance->ld_ids_from_raidmap,0xff ,MEGASAS_MAX_LD_IDS );/*Convert Raid capability values to CPU arch */ for (i =0 ; (num_lds >0 ) && (i <MAX_LOGICAL_DRIVES_EXT ); i++) { ld =MR_TargetIdToLdGet (i, drv_map);
@@ -359,7 +363,7 @@ u8 MR_ValidateMapInfo(struct megasas_instance *instance, u64 map_id) raid =MR_LdRaidGet (ld, drv_map);le32_to_cpus ((u32 *)&raid->capability); - + instance->ld_ids_from_raidmap[i] = i; num_lds--; }
Signature · 1 line
2.18.1
Chandrakanth Patil
maintainerPATCH v3 4/5 megaraid_sas: Handle missing interrupts while re-enabling IRQs
In reply to Chandrakanth PatilWhile reenabling the IRQ after irq poll there may be a small window for the firmware to post the replies with interrupts raised. In that case, driver will not see the interrupts which lead to IOs timeout.
This issue hits only when there is a high IOs completion on a single reply queue, which forces the driver to switch between the interrupt and IRQ context.
To fix this, driver will process the reply queue one more time after enabling the IRQ.
--- drivers/scsi/megaraid/megaraid_sas_fusion.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/scsi/megaraid/megaraid_sas_fusion.c +7 -2
@@ -3745,6 +3745,7 @@ static void megasas_sync_irqs(unsigned long instance_addr)if (irq_ctx->irq_poll_scheduled) { irq_ctx->irq_poll_scheduled = false;enable_irq (irq_ctx->os_irq); +complete_cmd_fusion (instance, irq_ctx->MSIxIndex, irq_ctx); } } }
@@ -3776,6 +3777,7 @@ int megasas_irqpoll(struct irq_poll *irqpoll, int budget)irq_poll_complete (irqpoll); irq_ctx->irq_poll_scheduled = false;enable_irq (irq_ctx->os_irq); +complete_cmd_fusion (instance, irq_ctx->MSIxIndex, irq_ctx); }return num_entries;
@@ -3792,6 +3794,7 @@ megasas_complete_cmd_dpc_fusion(unsigned long instance_addr) {struct megasas_instance *instance = (struct megasas_instance *)instance_addr; +struct megasas_irq_context *irq_ctx =NULL ;u32 count, MSIxIndex; count = instance->msix_vectors >0 ? instance->msix_vectors :1 ;
@@ -3800,8 +3803,10 @@ megasas_complete_cmd_dpc_fusion(unsigned long instance_addr)if (atomic_read (&instance->adprecovery) ==MEGASAS_HW_CRITICAL_ERROR )return ; -for (MSIxIndex =0 ; MSIxIndex < count; MSIxIndex++) -complete_cmd_fusion (instance, MSIxIndex,NULL ); +for (MSIxIndex =0 ; MSIxIndex < count; MSIxIndex++) { + irq_ctx = &instance->irq_context[MSIxIndex]; +complete_cmd_fusion (instance, MSIxIndex, irq_ctx); + } }/**
Signature · 1 line
2.18.1
Chandrakanth Patil
maintainerPATCH v3 5/5 megaraid_sas: Update driver version to 07.717.02.00-rc1
In reply to Chandrakanth Patil--- drivers/scsi/megaraid/megaraid_sas.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/megaraid/megaraid_sas.h +2 -2
@@ -21,8 +21,8 @@/* * MegaRAID SAS Driver meta data */ -#define MEGASAS_VERSION "07.714.04.00-rc1" -#define MEGASAS_RELDATE "Apr 14, 2020" +#define MEGASAS_VERSION "07.717.02.00-rc1" +#define MEGASAS_RELDATE "May 19, 2021"#define MEGASAS_MSIX_NAME_LEN 32
Signature · 1 line
2.18.1
Martin K. Petersen
AppliedChandrakanth,
Quoted 1 line
This patchset contains few critical fixes and enhancements.
Applied to 5.14/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 8 lines · Chandrakanth Patil
This patchset contains few critical fixes and enhancements.
v2:
- Fixed sparse warnings reported by kbuild test robot in patch3.
v3:
- Fixed sparse warnings reported by kbuild test robot in patch4.[...]
Applied to 5.14/scsi-queue, thanks!
[1/5] megaraid_sas: Send all non-RW IOs for TYPE_ENCLOSURE device through firmware
https://git.kernel.org/mkp/scsi/c/79db830162b7 [2/5] megaraid_sas: Fix the resource leak in case of probe failure https://git.kernel.org/mkp/scsi/c/b5438f48fdd8 [3/5] megaraid_sas: Early detection of VD deletion through RaidMap update https://git.kernel.org/mkp/scsi/c/ae6874ba4b43 [4/5] megaraid_sas: Handle missing interrupts while re-enabling IRQs https://git.kernel.org/mkp/scsi/c/9bedd36e9146 [5/5] megaraid_sas: Update driver version to 07.717.02.00-rc1 https://git.kernel.org/mkp/scsi/c/6143f6f62052
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering