scsi: mpt3sas: Reduce memory footprint in kdump kernel

To reduce the memory footprint of the driver in the kdump kernel, we
apply the following settings when reset_devices is set:

1. Use single MSI-x vector.
2. Disable RDPQ mode.
3. Set sg_table_size to 32 by default.
4) Set SCSI IO Queue depth to 200.

[mkp: fixed commit message]

Signed-off-by: Sreekanth Reddy <Sreekanth.Reddy@broadcom.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Orabug: 26894858
(cherry picked from commit 06f5f976a6ee0f8bbb0dd648415eeac0536fef97)
Signed-off-by: Jack Vogel <jack.vogel@oracle.com>
Reviewed-by: Dhaval Giani <dhaval.giani@oracle.com>

diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c
index 9610369507bdc41e0b977ea3c8cbd93d53ceaad7..c78585d26948197728206aea956f52fbff44b851 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@ -1996,7 +1996,7 @@ _base_enable_msix(struct MPT3SAS_ADAPTER *ioc)
          ioc->cpu_count, max_msix_vectors);
 
        if (!ioc->rdpq_array_enable && max_msix_vectors == -1)
-               local_max_msix_vectors = 8;
+               local_max_msix_vectors = (reset_devices) ? 1 : 8;
        else
                local_max_msix_vectors = max_msix_vectors;
 
@@ -3323,6 +3323,11 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc)
                        sg_tablesize = MPT3SAS_SG_DEPTH;
        }
 
+       /* max sgl entries <= MPT_KDUMP_MIN_PHYS_SEGMENTS in KDUMP mode */
+       if (reset_devices)
+               sg_tablesize = min_t(unsigned short, sg_tablesize,
+                  MPT_KDUMP_MIN_PHYS_SEGMENTS);
+
        if (sg_tablesize < MPT_MIN_PHYS_SEGMENTS)
                sg_tablesize = MPT_MIN_PHYS_SEGMENTS;
        else if (sg_tablesize > MPT_MAX_PHYS_SEGMENTS) {
@@ -3355,7 +3360,10 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc)
                        ioc->internal_depth, facts->RequestCredit);
                if (max_request_credit > MAX_HBA_QUEUE_DEPTH)
                        max_request_credit =  MAX_HBA_QUEUE_DEPTH;
-       } else
+       } else if (reset_devices)
+               max_request_credit = min_t(u16, facts->RequestCredit,
+                   (MPT3SAS_KDUMP_SCSI_IO_DEPTH + ioc->internal_depth));
+       else
                max_request_credit = min_t(u16, facts->RequestCredit,
                    MAX_HBA_QUEUE_DEPTH);
 
@@ -4461,7 +4469,7 @@ _base_get_ioc_facts(struct MPT3SAS_ADAPTER *ioc)
        if ((facts->IOCCapabilities & MPI2_IOCFACTS_CAPABILITY_INTEGRATED_RAID))
                ioc->ir_firmware = 1;
        if ((facts->IOCCapabilities &
-             MPI2_IOCFACTS_CAPABILITY_RDPQ_ARRAY_CAPABLE))
+             MPI2_IOCFACTS_CAPABILITY_RDPQ_ARRAY_CAPABLE) && (!reset_devices))
                ioc->rdpq_array_capable = 1;
        if (facts->IOCCapabilities & MPI26_IOCFACTS_CAPABILITY_ATOMIC_REQ)
                ioc->atomic_desc_capable = 1;

diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.h b/drivers/scsi/mpt3sas/mpt3sas_base.h
index f3828bc4f8eec1a09d19e9015c043f99d68248ab..2ff84fd3c87f1d5cd2e4c6d71cb2b6e75bfcb12a 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_base.h
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.h
@@ -92,6 +92,7 @@
  */
 #define MPT_MAX_PHYS_SEGMENTS  SCSI_MAX_SG_SEGMENTS
 #define MPT_MIN_PHYS_SEGMENTS  16
+#define MPT_KDUMP_MIN_PHYS_SEGMENTS    32
 
 #ifdef CONFIG_SCSI_MPT3SAS_MAX_SGE
 #define MPT3SAS_SG_DEPTH               CONFIG_SCSI_MPT3SAS_MAX_SGE
@@ -111,6 +112,7 @@
 #define MPT3SAS_SATA_QUEUE_DEPTH       32
 #define MPT3SAS_SAS_QUEUE_DEPTH                254
 #define MPT3SAS_RAID_QUEUE_DEPTH       128
+#define MPT3SAS_KDUMP_SCSI_IO_DEPTH    200
 
 #define MPT3SAS_RAID_MAX_SECTORS       8192