From: Lee Jones <lee.jones@linaro.org>
To: lee.jones@linaro.org
Cc: linux-kernel@vger.kernel.org,
Sathya Prakash <sathya.prakash@broadcom.com>,
Sreekanth Reddy <sreekanth.reddy@broadcom.com>,
Suganath Prabu Subramani <suganath-prabu.subramani@broadcom.com>,
"James E.J. Bottomley" <jejb@linux.ibm.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
MPT-FusionLinux.pdl@avagotech.com,
MPT-FusionLinux.pdl@broadcom.com, linux-scsi@vger.kernel.org
Subject: [PATCH 30/30] scsi: mpt3sas: mpt3sas_scs: Move a little data from the stack onto the heap
Date: Wed, 3 Mar 2021 14:46:31 +0000 [thread overview]
Message-ID: <20210303144631.3175331-31-lee.jones@linaro.org> (raw)
In-Reply-To: <20210303144631.3175331-1-lee.jones@linaro.org>
Fixes the following W=1 kernel build warning(s):
drivers/scsi/mpt3sas/mpt3sas_scsih.c: In function ‘_scsih_scan_for_devices_after_reset’:
drivers/scsi/mpt3sas/mpt3sas_scsih.c:10473:1: warning: the frame size of 1064 bytes is larger than 1024 bytes [-Wframe-larger-than=]
Cc: Sathya Prakash <sathya.prakash@broadcom.com>
Cc: Sreekanth Reddy <sreekanth.reddy@broadcom.com>
Cc: Suganath Prabu Subramani <suganath-prabu.subramani@broadcom.com>
Cc: "James E.J. Bottomley" <jejb@linux.ibm.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: MPT-FusionLinux.pdl@avagotech.com
Cc: MPT-FusionLinux.pdl@broadcom.com
Cc: linux-scsi@vger.kernel.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/scsi/mpt3sas/mpt3sas_scsih.c | 38 +++++++++++++++++++---------
1 file changed, 26 insertions(+), 12 deletions(-)
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 7bd0a57e5b928..945531e94d7e4 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -10219,8 +10219,8 @@ _scsih_scan_for_devices_after_reset(struct MPT3SAS_ADAPTER *ioc)
Mpi2ExpanderPage0_t expander_pg0;
Mpi2SasDevicePage0_t sas_device_pg0;
Mpi26PCIeDevicePage0_t pcie_device_pg0;
- Mpi2RaidVolPage1_t volume_pg1;
- Mpi2RaidVolPage0_t volume_pg0;
+ Mpi2RaidVolPage1_t *volume_pg1;
+ Mpi2RaidVolPage0_t *volume_pg0;
Mpi2RaidPhysDiskPage0_t pd_pg0;
Mpi2EventIrConfigElement_t element;
Mpi2ConfigReply_t mpi_reply;
@@ -10235,6 +10235,16 @@ _scsih_scan_for_devices_after_reset(struct MPT3SAS_ADAPTER *ioc)
u8 retry_count;
unsigned long flags;
+ volume_pg0 = kzalloc(sizeof(*volume_pg0), GFP_KERNEL);
+ if (!volume_pg0)
+ return;
+
+ volume_pg1 = kzalloc(sizeof(*volume_pg1), GFP_KERNEL);
+ if (!volume_pg1) {
+ kfree(volume_pg0);
+ return;
+ }
+
ioc_info(ioc, "scan devices: start\n");
_scsih_sas_host_refresh(ioc);
@@ -10344,7 +10354,7 @@ _scsih_scan_for_devices_after_reset(struct MPT3SAS_ADAPTER *ioc)
/* volumes */
handle = 0xFFFF;
while (!(mpt3sas_config_get_raid_volume_pg1(ioc, &mpi_reply,
- &volume_pg1, MPI2_RAID_VOLUME_PGAD_FORM_GET_NEXT_HANDLE, handle))) {
+ volume_pg1, MPI2_RAID_VOLUME_PGAD_FORM_GET_NEXT_HANDLE, handle))) {
ioc_status = le16_to_cpu(mpi_reply.IOCStatus) &
MPI2_IOCSTATUS_MASK;
if (ioc_status != MPI2_IOCSTATUS_SUCCESS) {
@@ -10352,15 +10362,15 @@ _scsih_scan_for_devices_after_reset(struct MPT3SAS_ADAPTER *ioc)
ioc_status, le32_to_cpu(mpi_reply.IOCLogInfo));
break;
}
- handle = le16_to_cpu(volume_pg1.DevHandle);
+ handle = le16_to_cpu(volume_pg1->DevHandle);
spin_lock_irqsave(&ioc->raid_device_lock, flags);
raid_device = _scsih_raid_device_find_by_wwid(ioc,
- le64_to_cpu(volume_pg1.WWID));
+ le64_to_cpu(volume_pg1->WWID));
spin_unlock_irqrestore(&ioc->raid_device_lock, flags);
if (raid_device)
continue;
if (mpt3sas_config_get_raid_volume_pg0(ioc, &mpi_reply,
- &volume_pg0, MPI2_RAID_VOLUME_PGAD_FORM_HANDLE, handle,
+ volume_pg0, MPI2_RAID_VOLUME_PGAD_FORM_HANDLE, handle,
sizeof(Mpi2RaidVolPage0_t)))
continue;
ioc_status = le16_to_cpu(mpi_reply.IOCStatus) &
@@ -10370,17 +10380,17 @@ _scsih_scan_for_devices_after_reset(struct MPT3SAS_ADAPTER *ioc)
ioc_status, le32_to_cpu(mpi_reply.IOCLogInfo));
break;
}
- if (volume_pg0.VolumeState == MPI2_RAID_VOL_STATE_OPTIMAL ||
- volume_pg0.VolumeState == MPI2_RAID_VOL_STATE_ONLINE ||
- volume_pg0.VolumeState == MPI2_RAID_VOL_STATE_DEGRADED) {
+ if (volume_pg0->VolumeState == MPI2_RAID_VOL_STATE_OPTIMAL ||
+ volume_pg0->VolumeState == MPI2_RAID_VOL_STATE_ONLINE ||
+ volume_pg0->VolumeState == MPI2_RAID_VOL_STATE_DEGRADED) {
memset(&element, 0, sizeof(Mpi2EventIrConfigElement_t));
element.ReasonCode = MPI2_EVENT_IR_CHANGE_RC_ADDED;
- element.VolDevHandle = volume_pg1.DevHandle;
+ element.VolDevHandle = volume_pg1->DevHandle;
ioc_info(ioc, "\tBEFORE adding volume: handle (0x%04x)\n",
- volume_pg1.DevHandle);
+ volume_pg1->DevHandle);
_scsih_sas_volume_add(ioc, &element);
ioc_info(ioc, "\tAFTER adding volume: handle (0x%04x)\n",
- volume_pg1.DevHandle);
+ volume_pg1->DevHandle);
}
}
@@ -10468,6 +10478,10 @@ _scsih_scan_for_devices_after_reset(struct MPT3SAS_ADAPTER *ioc)
ioc_info(ioc, "\tAFTER adding pcie end device: handle (0x%04x), wwid(0x%016llx)\n",
handle, (u64)le64_to_cpu(pcie_device_pg0.WWID));
}
+
+ kfree(volume_pg0);
+ kfree(volume_pg1);
+
ioc_info(ioc, "\tpcie devices: pcie end devices complete\n");
ioc_info(ioc, "scan devices: complete\n");
}
--
2.27.0
next prev parent reply other threads:[~2021-03-04 0:32 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-03 14:46 [PATCH 00/30] [Set 1] Rid W=1 warnings in SCSI Lee Jones
2021-03-03 14:46 ` [PATCH 01/30] scsi: megaraid: megaraid_mm: Fix incorrect function name in header Lee Jones
2021-03-03 14:46 ` [PATCH 02/30] scsi: megaraid: megaraid_sas_base: Fix a bunch of misnamed functions in their headers Lee Jones
2021-03-03 14:46 ` [PATCH 03/30] scsi: fcoe: Fix function name fcoe_set_vport_symbolic_name() in description Lee Jones
2021-03-03 14:46 ` [PATCH 04/30] scsi: megaraid: megaraid_mbox: Fix function name megaraid_queue_command_lck() " Lee Jones
2021-03-03 14:46 ` [PATCH 05/30] scsi: fcoe: fcoe_ctlr: Fix a couple of incorrectly named functions Lee Jones
2021-03-03 14:46 ` [PATCH 06/30] scsi: aic94xx: aic94xx_hwi: Fix a couple of misnamed function names Lee Jones
2021-03-03 14:46 ` [PATCH 07/30] scsi: aacraid: aachba: Fix a few incorrectly named functions Lee Jones
2021-03-03 14:46 ` [PATCH 08/30] scsi: pm8001: pm8001_init: Provide function name and fix a misspelling Lee Jones
2021-03-04 9:51 ` Jinpu Wang
2021-03-03 14:46 ` [PATCH 09/30] scsi: aacraid: commctrl: Fix incorrect spelling of aac_send_raw_srb() Lee Jones
2021-03-03 14:46 ` [PATCH 10/30] scsi: bnx2fc: bnx2fc_hwi: Fix typo in bnx2fc_indicate_kcqe() Lee Jones
2021-03-03 14:46 ` [PATCH 11/30] scsi: pm8001: pm8001_sas: Provide function name 'pm8001_I_T_nexus_reset()' in header Lee Jones
2021-03-04 9:52 ` Jinpu Wang
2021-03-03 14:46 ` [PATCH 12/30] scsi: qla4xxx: ql4_os: Fix formatting issues - missing '-' and '_' Lee Jones
2021-03-03 16:12 ` [EXT] " Nilesh Javali
2021-03-03 14:46 ` [PATCH 13/30] scsi: pm8001: pm8001_ctl: Fix incorrectly named functions in headers Lee Jones
2021-03-04 9:52 ` Jinpu Wang
2021-03-03 14:46 ` [PATCH 14/30] scsi: aic94xx: aic94xx_sds: Fix asd_erase_nv_sector()'s header Lee Jones
2021-03-03 14:46 ` [PATCH 15/30] scsi: qla2xxx: qla_iocb: Replace __qla2x00_marker()'s missing underscores Lee Jones
2021-03-03 16:13 ` [EXT] " Nilesh Javali
2021-03-03 14:46 ` [PATCH 16/30] scsi: aacraid: commsup: Repair formatting issue in aac_handle_sa_aif()'s header Lee Jones
2021-03-03 14:46 ` [PATCH 17/30] scsi: lpfc: lpfc_sli: Fix a bunch of kernel-doc issues Lee Jones
2021-03-03 14:46 ` [PATCH 18/30] scsi: pm8001: pm8001_hwi: Fix some misnamed function descriptions Lee Jones
2021-03-04 9:53 ` Jinpu Wang
2021-03-03 14:46 ` [PATCH 19/30] scsi: qla4xxx: ql4_mbx: Fix kernel-doc formatting and misnaming issue Lee Jones
2021-03-03 16:13 ` [EXT] " Nilesh Javali
2021-03-03 14:46 ` [PATCH 20/30] scsi: bnx2fc: bnx2fc_tgt: Fix misnaming of bnx2fc_free_session_resc() Lee Jones
2021-03-03 14:46 ` [PATCH 21/30] scsi: aic94xx: aic94xx_dump: Remove code that has been unused for at least 13 years Lee Jones
2021-03-03 14:46 ` [PATCH 22/30] scsi: pm8001: pm80xx_hwi: Fix a bunch of doc-rotted function headers Lee Jones
2021-03-04 9:53 ` Jinpu Wang
2021-03-03 14:46 ` [PATCH 23/30] scsi: qla2xxx: qla_gs: Fix some incorrect formatting/spelling issues Lee Jones
2021-03-03 16:13 ` [EXT] " Nilesh Javali
2021-03-03 14:46 ` [PATCH 24/30] scsi: aacraid: rx: Fix misspelling of _aac_rx_init() Lee Jones
2021-03-03 14:46 ` [PATCH 25/30] scsi: lpfc: lpfc_ct: Fix formatting and misspelling issues Lee Jones
2021-03-03 14:46 ` [PATCH 26/30] scsi: libfc: fc_lport: Fix some possible copy/paste issues Lee Jones
2021-03-03 14:46 ` [PATCH 27/30] scsi: lpfc: lpfc_hbadisc: Fix incorrect naming of __lpfc_update_fcf_record() Lee Jones
2021-03-03 14:46 ` [PATCH 28/30] scsi: mpt3sas: mpt3sas_base: Fix misspelling of _base_put_smid_default_atomic() Lee Jones
2021-03-03 14:46 ` [PATCH 29/30] scsi: lpfc: lpfc_nportdisc: Fix misspelling of lpfc_defer_acc_rsp() Lee Jones
2021-03-03 14:46 ` Lee Jones [this message]
2021-03-16 2:15 ` [PATCH 00/30] [Set 1] Rid W=1 warnings in SCSI Martin K. Petersen
2021-03-19 3:46 ` Martin K. Petersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210303144631.3175331-31-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=MPT-FusionLinux.pdl@avagotech.com \
--cc=MPT-FusionLinux.pdl@broadcom.com \
--cc=jejb@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=sathya.prakash@broadcom.com \
--cc=sreekanth.reddy@broadcom.com \
--cc=suganath-prabu.subramani@broadcom.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).