scsi: bfa: Move a large struct from the stack onto the heap
authorLee Jones <lee.jones@linaro.org>
Fri, 12 Mar 2021 09:47:22 +0000 (09:47 +0000)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 16 Mar 2021 02:28:58 +0000 (22:28 -0400)
Fixes the following W=1 kernel build warning(s):

 drivers/scsi/bfa/bfa_fcs_lport.c: In function ‘bfa_fcs_lport_fdmi_build_rhba_pyld’:
 drivers/scsi/bfa/bfa_fcs_lport.c:2152:1: warning: the frame size of 1200 bytes is larger than 1024 bytes [-Wframe-larger-than=]

Link: https://lore.kernel.org/r/20210312094738.2207817-15-lee.jones@linaro.org
Cc: Anil Gurumurthy <anil.gurumurthy@qlogic.com>
Cc: Sudarsana Kalluru <sudarsana.kalluru@qlogic.com>
Cc: "James E.J. Bottomley" <jejb@linux.ibm.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: linux-scsi@vger.kernel.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/bfa/bfa_fcs_lport.c

index 49a1415..b12afcc 100644 (file)
@@ -1408,7 +1408,7 @@ static void     bfa_fcs_lport_fdmi_rpa_response(void *fcsarg,
                                               u32 resid_len,
                                               struct fchs_s *rsp_fchs);
 static void     bfa_fcs_lport_fdmi_timeout(void *arg);
-static u16 bfa_fcs_lport_fdmi_build_rhba_pyld(struct bfa_fcs_lport_fdmi_s *fdmi,
+static int bfa_fcs_lport_fdmi_build_rhba_pyld(struct bfa_fcs_lport_fdmi_s *fdmi,
                                                  u8 *pyld);
 static u16 bfa_fcs_lport_fdmi_build_rprt_pyld(struct bfa_fcs_lport_fdmi_s *fdmi,
                                                  u8 *pyld);
@@ -1887,6 +1887,8 @@ bfa_fcs_lport_fdmi_send_rhba(void *fdmi_cbarg, struct bfa_fcxp_s *fcxp_alloced)
                bfa_fcs_lport_fdmi_build_rhba_pyld(fdmi,
                                          (u8 *) ((struct ct_hdr_s *) pyld
                                                       + 1));
+       if (attr_len < 0)
+               return;
 
        bfa_fcxp_send(fcxp, NULL, port->fabric->vf_id, port->lp_tag, BFA_FALSE,
                          FC_CLASS_3, (len + attr_len), &fchs,
@@ -1896,17 +1898,20 @@ bfa_fcs_lport_fdmi_send_rhba(void *fdmi_cbarg, struct bfa_fcxp_s *fcxp_alloced)
        bfa_sm_send_event(fdmi, FDMISM_EVENT_RHBA_SENT);
 }
 
-static          u16
+static int
 bfa_fcs_lport_fdmi_build_rhba_pyld(struct bfa_fcs_lport_fdmi_s *fdmi, u8 *pyld)
 {
        struct bfa_fcs_lport_s *port = fdmi->ms->port;
-       struct bfa_fcs_fdmi_hba_attr_s hba_attr;
-       struct bfa_fcs_fdmi_hba_attr_s *fcs_hba_attr = &hba_attr;
+       struct bfa_fcs_fdmi_hba_attr_s *fcs_hba_attr;
        struct fdmi_rhba_s *rhba = (struct fdmi_rhba_s *) pyld;
        struct fdmi_attr_s *attr;
+       int        len;
        u8        *curr_ptr;
-       u16        len, count;
-       u16     templen;
+       u16     templen, count;
+
+       fcs_hba_attr = kzalloc(sizeof(*fcs_hba_attr), GFP_KERNEL);
+       if (!fcs_hba_attr)
+               return -ENOMEM;
 
        /*
         * get hba attributes
@@ -2148,6 +2153,9 @@ bfa_fcs_lport_fdmi_build_rhba_pyld(struct bfa_fcs_lport_fdmi_s *fdmi, u8 *pyld)
        len += ((sizeof(attr->type) + sizeof(attr->len)) * count);
 
        rhba->hba_attr_blk.attr_count = cpu_to_be32(count);
+
+       kfree(fcs_hba_attr);
+
        return len;
 }