Commit c3f1b123 authored by Krishna Gudipati's avatar Krishna Gudipati Committed by James Bottomley
Browse files

[SCSI] bfa: Make changes to FCXP resource management. 



- Made changes to split FCXP resources as request and response resources.
- The split will reduce the contention for FCXP resources in an open zone
  config.

Signed-off-by: default avatarKrishna Gudipati <kgudipat@brocade.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent ee1a4a42

drivers/scsi/bfa/bfa_cs.h

+2 −2
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ __bfa_trc32(struct bfa_trc_mod_s *trcm, int fileno, int line, u32 data) 
/*

 * bfa_q_deq - dequeue an element from head of the queue

 */

#define bfa_q_deq(_q, _qe) {						\

#define bfa_q_deq(_q, _qe) do {						\

	if (!list_empty(_q)) {						\

		(*((struct list_head **) (_qe))) = bfa_q_next(_q);	\

		bfa_q_prev(bfa_q_next(*((struct list_head **) _qe))) =	\
@@ -177,7 +177,7 @@ __bfa_trc32(struct bfa_trc_mod_s *trcm, int fileno, int line, u32 data) 
	} else {							\

		*((struct list_head **) (_qe)) = (struct list_head *) NULL;\

	}								\

}

} while (0)



/*

 * bfa_q_deq_tail - dequeue an element from tail of the queue

drivers/scsi/bfa/bfa_fcs.c

+1 −1
Original line number Diff line number Diff line
@@ -1294,7 +1294,7 @@ bfa_fcs_fabric_send_flogi_acc(struct bfa_fcs_fabric_s *fabric) 
	u16	reqlen;

	struct fchs_s	fchs;



	fcxp = bfa_fcs_fcxp_alloc(fabric->fcs);

	fcxp = bfa_fcs_fcxp_alloc(fabric->fcs, BFA_FALSE);

	/*

	 * Do not expect this failure -- expect remote node to retry

	 */

drivers/scsi/bfa/bfa_fcs.h

+7 −6
Original line number Diff line number Diff line
@@ -511,12 +511,13 @@ struct bfa_fcs_itnim_s { 
	struct bfa_fcxp_s	*fcxp;		/*  FCXP in use	*/

	struct bfa_itnim_stats_s	stats;	/*  itn statistics	*/

};

#define bfa_fcs_fcxp_alloc(__fcs)	\

	bfa_fcxp_alloc(NULL, (__fcs)->bfa, 0, 0, NULL, NULL, NULL, NULL)



#define bfa_fcs_fcxp_alloc_wait(__bfa, __wqe, __alloc_cbfn, __alloc_cbarg) \

	bfa_fcxp_alloc_wait(__bfa, __wqe, __alloc_cbfn, __alloc_cbarg, \

					NULL, 0, 0, NULL, NULL, NULL, NULL)

#define bfa_fcs_fcxp_alloc(__fcs, __req)				\

	bfa_fcxp_req_rsp_alloc(NULL, (__fcs)->bfa, 0, 0,		\

			       NULL, NULL, NULL, NULL, __req)

#define bfa_fcs_fcxp_alloc_wait(__bfa, __wqe, __alloc_cbfn,		\

				__alloc_cbarg, __req)			\

	bfa_fcxp_req_rsp_alloc_wait(__bfa, __wqe, __alloc_cbfn,		\

		__alloc_cbarg, NULL, 0, 0, NULL, NULL, NULL, NULL, __req)



static inline struct bfad_port_s *

bfa_fcs_itnim_get_drvport(struct bfa_fcs_itnim_s *itnim)

drivers/scsi/bfa/bfa_fcs_fcpim.c

+3 −2
Original line number Diff line number Diff line
@@ -426,11 +426,12 @@ bfa_fcs_itnim_send_prli(void *itnim_cbarg, struct bfa_fcxp_s *fcxp_alloced) 


	bfa_trc(itnim->fcs, itnim->rport->pwwn);



	fcxp = fcxp_alloced ? fcxp_alloced : bfa_fcs_fcxp_alloc(port->fcs);

	fcxp = fcxp_alloced ? fcxp_alloced :

	       bfa_fcs_fcxp_alloc(port->fcs, BFA_TRUE);

	if (!fcxp) {

		itnim->stats.fcxp_alloc_wait++;

		bfa_fcs_fcxp_alloc_wait(port->fcs->bfa, &itnim->fcxp_wqe,

				    bfa_fcs_itnim_send_prli, itnim);

				bfa_fcs_itnim_send_prli, itnim, BFA_TRUE);

		return;

	}

	itnim->fcxp = fcxp;

drivers/scsi/bfa/bfa_fcs_lport.c

+45 −32
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ bfa_fcs_lport_send_ls_rjt(struct bfa_fcs_lport_s *port, struct fchs_s *rx_fchs, 
	bfa_trc(port->fcs, rx_fchs->d_id);

	bfa_trc(port->fcs, rx_fchs->s_id);



	fcxp = bfa_fcs_fcxp_alloc(port->fcs);

	fcxp = bfa_fcs_fcxp_alloc(port->fcs, BFA_FALSE);

	if (!fcxp)

		return;
@@ -370,7 +370,7 @@ bfa_fcs_lport_send_fcgs_rjt(struct bfa_fcs_lport_s *port, 
	bfa_trc(port->fcs, rx_fchs->d_id);

	bfa_trc(port->fcs, rx_fchs->s_id);



	fcxp = bfa_fcs_fcxp_alloc(port->fcs);

	fcxp = bfa_fcs_fcxp_alloc(port->fcs, BFA_FALSE);

	if (!fcxp)

		return;
@@ -507,7 +507,7 @@ bfa_fcs_lport_echo(struct bfa_fcs_lport_s *port, struct fchs_s *rx_fchs, 
	bfa_trc(port->fcs, rx_fchs->s_id);

	bfa_trc(port->fcs, rx_fchs->d_id);



	fcxp = bfa_fcs_fcxp_alloc(port->fcs);

	fcxp = bfa_fcs_fcxp_alloc(port->fcs, BFA_FALSE);

	if (!fcxp)

		return;
@@ -552,7 +552,7 @@ bfa_fcs_lport_rnid(struct bfa_fcs_lport_s *port, struct fchs_s *rx_fchs, 
	bfa_trc(port->fcs, rx_fchs->d_id);

	bfa_trc(port->fcs, rx_len);



	fcxp = bfa_fcs_fcxp_alloc(port->fcs);

	fcxp = bfa_fcs_fcxp_alloc(port->fcs, BFA_FALSE);

	if (!fcxp)

		return;
@@ -684,7 +684,7 @@ bfa_fcs_lport_abts_acc(struct bfa_fcs_lport_s *port, struct fchs_s *rx_fchs) 
	bfa_trc(port->fcs, rx_fchs->d_id);

	bfa_trc(port->fcs, rx_fchs->s_id);



	fcxp = bfa_fcs_fcxp_alloc(port->fcs);

	fcxp = bfa_fcs_fcxp_alloc(port->fcs, BFA_FALSE);

	if (!fcxp)

		return;
@@ -1696,10 +1696,11 @@ bfa_fcs_lport_fdmi_send_rhba(void *fdmi_cbarg, struct bfa_fcxp_s *fcxp_alloced) 


	bfa_trc(port->fcs, port->port_cfg.pwwn);



	fcxp = fcxp_alloced ? fcxp_alloced : bfa_fcs_fcxp_alloc(port->fcs);

	fcxp = fcxp_alloced ? fcxp_alloced :

	       bfa_fcs_fcxp_alloc(port->fcs, BFA_TRUE);

	if (!fcxp) {

		bfa_fcs_fcxp_alloc_wait(port->fcs->bfa, &fdmi->fcxp_wqe,

					bfa_fcs_lport_fdmi_send_rhba, fdmi);

				bfa_fcs_lport_fdmi_send_rhba, fdmi, BFA_TRUE);

		return;

	}

	fdmi->fcxp = fcxp;
@@ -1970,10 +1971,11 @@ bfa_fcs_lport_fdmi_send_rprt(void *fdmi_cbarg, struct bfa_fcxp_s *fcxp_alloced) 


	bfa_trc(port->fcs, port->port_cfg.pwwn);



	fcxp = fcxp_alloced ? fcxp_alloced : bfa_fcs_fcxp_alloc(port->fcs);

	fcxp = fcxp_alloced ? fcxp_alloced :

	       bfa_fcs_fcxp_alloc(port->fcs, BFA_TRUE);

	if (!fcxp) {

		bfa_fcs_fcxp_alloc_wait(port->fcs->bfa, &fdmi->fcxp_wqe,

					bfa_fcs_lport_fdmi_send_rprt, fdmi);

				bfa_fcs_lport_fdmi_send_rprt, fdmi, BFA_TRUE);

		return;

	}

	fdmi->fcxp = fcxp;
@@ -2185,10 +2187,11 @@ bfa_fcs_lport_fdmi_send_rpa(void *fdmi_cbarg, struct bfa_fcxp_s *fcxp_alloced) 


	bfa_trc(port->fcs, port->port_cfg.pwwn);



	fcxp = fcxp_alloced ? fcxp_alloced : bfa_fcs_fcxp_alloc(port->fcs);

	fcxp = fcxp_alloced ? fcxp_alloced :

	       bfa_fcs_fcxp_alloc(port->fcs, BFA_TRUE);

	if (!fcxp) {

		bfa_fcs_fcxp_alloc_wait(port->fcs->bfa, &fdmi->fcxp_wqe,

					bfa_fcs_lport_fdmi_send_rpa, fdmi);

				bfa_fcs_lport_fdmi_send_rpa, fdmi, BFA_TRUE);

		return;

	}

	fdmi->fcxp = fcxp;
@@ -2775,10 +2778,11 @@ bfa_fcs_lport_ms_send_gmal(void *ms_cbarg, struct bfa_fcxp_s *fcxp_alloced) 


	bfa_trc(port->fcs, port->pid);



	fcxp = fcxp_alloced ? fcxp_alloced : bfa_fcs_fcxp_alloc(port->fcs);

	fcxp = fcxp_alloced ? fcxp_alloced :

	       bfa_fcs_fcxp_alloc(port->fcs, BFA_TRUE);

	if (!fcxp) {

		bfa_fcs_fcxp_alloc_wait(port->fcs->bfa, &ms->fcxp_wqe,

					bfa_fcs_lport_ms_send_gmal, ms);

				bfa_fcs_lport_ms_send_gmal, ms, BFA_TRUE);

		return;

	}

	ms->fcxp = fcxp;
@@ -2975,10 +2979,11 @@ bfa_fcs_lport_ms_send_gfn(void *ms_cbarg, struct bfa_fcxp_s *fcxp_alloced) 


	bfa_trc(port->fcs, port->pid);



	fcxp = fcxp_alloced ? fcxp_alloced : bfa_fcs_fcxp_alloc(port->fcs);

	fcxp = fcxp_alloced ? fcxp_alloced :

	       bfa_fcs_fcxp_alloc(port->fcs, BFA_TRUE);

	if (!fcxp) {

		bfa_fcs_fcxp_alloc_wait(port->fcs->bfa, &ms->fcxp_wqe,

					bfa_fcs_lport_ms_send_gfn, ms);

				bfa_fcs_lport_ms_send_gfn, ms, BFA_TRUE);

		return;

	}

	ms->fcxp = fcxp;
@@ -3051,11 +3056,12 @@ bfa_fcs_lport_ms_send_plogi(void *ms_cbarg, struct bfa_fcxp_s *fcxp_alloced) 


	bfa_trc(port->fcs, port->pid);



	fcxp = fcxp_alloced ? fcxp_alloced : bfa_fcs_fcxp_alloc(port->fcs);

	fcxp = fcxp_alloced ? fcxp_alloced :

	       bfa_fcs_fcxp_alloc(port->fcs, BFA_TRUE);

	if (!fcxp) {

		port->stats.ms_plogi_alloc_wait++;

		bfa_fcs_fcxp_alloc_wait(port->fcs->bfa, &ms->fcxp_wqe,

					bfa_fcs_lport_ms_send_plogi, ms);

				bfa_fcs_lport_ms_send_plogi, ms, BFA_TRUE);

		return;

	}

	ms->fcxp = fcxp;
@@ -3809,11 +3815,12 @@ bfa_fcs_lport_ns_send_plogi(void *ns_cbarg, struct bfa_fcxp_s *fcxp_alloced) 


	bfa_trc(port->fcs, port->pid);



	fcxp = fcxp_alloced ? fcxp_alloced : bfa_fcs_fcxp_alloc(port->fcs);

	fcxp = fcxp_alloced ? fcxp_alloced :

	       bfa_fcs_fcxp_alloc(port->fcs, BFA_TRUE);

	if (!fcxp) {

		port->stats.ns_plogi_alloc_wait++;

		bfa_fcs_fcxp_alloc_wait(port->fcs->bfa, &ns->fcxp_wqe,

					bfa_fcs_lport_ns_send_plogi, ns);

				bfa_fcs_lport_ns_send_plogi, ns, BFA_TRUE);

		return;

	}

	ns->fcxp = fcxp;
@@ -3909,11 +3916,12 @@ bfa_fcs_lport_ns_send_rspn_id(void *ns_cbarg, struct bfa_fcxp_s *fcxp_alloced) 


	bfa_trc(port->fcs, port->port_cfg.pwwn);



	fcxp = fcxp_alloced ? fcxp_alloced : bfa_fcs_fcxp_alloc(port->fcs);

	fcxp = fcxp_alloced ? fcxp_alloced :

	       bfa_fcs_fcxp_alloc(port->fcs, BFA_TRUE);

	if (!fcxp) {

		port->stats.ns_rspnid_alloc_wait++;

		bfa_fcs_fcxp_alloc_wait(port->fcs->bfa, &ns->fcxp_wqe,

					bfa_fcs_lport_ns_send_rspn_id, ns);

				bfa_fcs_lport_ns_send_rspn_id, ns, BFA_TRUE);

		return;

	}

	ns->fcxp = fcxp;
@@ -4010,11 +4018,12 @@ bfa_fcs_lport_ns_send_rft_id(void *ns_cbarg, struct bfa_fcxp_s *fcxp_alloced) 


	bfa_trc(port->fcs, port->port_cfg.pwwn);



	fcxp = fcxp_alloced ? fcxp_alloced : bfa_fcs_fcxp_alloc(port->fcs);

	fcxp = fcxp_alloced ? fcxp_alloced :

	       bfa_fcs_fcxp_alloc(port->fcs, BFA_TRUE);

	if (!fcxp) {

		port->stats.ns_rftid_alloc_wait++;

		bfa_fcs_fcxp_alloc_wait(port->fcs->bfa, &ns->fcxp_wqe,

					bfa_fcs_lport_ns_send_rft_id, ns);

				bfa_fcs_lport_ns_send_rft_id, ns, BFA_TRUE);

		return;

	}

	ns->fcxp = fcxp;
@@ -4083,11 +4092,12 @@ bfa_fcs_lport_ns_send_rff_id(void *ns_cbarg, struct bfa_fcxp_s *fcxp_alloced) 


	bfa_trc(port->fcs, port->port_cfg.pwwn);



	fcxp = fcxp_alloced ? fcxp_alloced : bfa_fcs_fcxp_alloc(port->fcs);

	fcxp = fcxp_alloced ? fcxp_alloced :

	       bfa_fcs_fcxp_alloc(port->fcs, BFA_TRUE);

	if (!fcxp) {

		port->stats.ns_rffid_alloc_wait++;

		bfa_fcs_fcxp_alloc_wait(port->fcs->bfa, &ns->fcxp_wqe,

					bfa_fcs_lport_ns_send_rff_id, ns);

				bfa_fcs_lport_ns_send_rff_id, ns, BFA_TRUE);

		return;

	}

	ns->fcxp = fcxp;
@@ -4166,11 +4176,12 @@ bfa_fcs_lport_ns_send_gid_ft(void *ns_cbarg, struct bfa_fcxp_s *fcxp_alloced) 


	bfa_trc(port->fcs, port->pid);



	fcxp = fcxp_alloced ? fcxp_alloced : bfa_fcs_fcxp_alloc(port->fcs);

	fcxp = fcxp_alloced ? fcxp_alloced :

	       bfa_fcs_fcxp_alloc(port->fcs, BFA_TRUE);

	if (!fcxp) {

		port->stats.ns_gidft_alloc_wait++;

		bfa_fcs_fcxp_alloc_wait(port->fcs->bfa, &ns->fcxp_wqe,

					bfa_fcs_lport_ns_send_gid_ft, ns);

				bfa_fcs_lport_ns_send_gid_ft, ns, BFA_TRUE);

		return;

	}

	ns->fcxp = fcxp;
@@ -4419,11 +4430,12 @@ bfa_fcs_lport_ns_util_send_rspn_id(void *cbarg, struct bfa_fcxp_s *fcxp_alloced) 
	memset(symbl, 0, sizeof(symbl));

	bfa_trc(port->fcs, port->port_cfg.pwwn);



	fcxp = fcxp_alloced ? fcxp_alloced : bfa_fcs_fcxp_alloc(port->fcs);

	fcxp = fcxp_alloced ? fcxp_alloced :

	       bfa_fcs_fcxp_alloc(port->fcs, BFA_FALSE);

	if (!fcxp) {

		port->stats.ns_rspnid_alloc_wait++;

		bfa_fcs_fcxp_alloc_wait(port->fcs->bfa, &ns->fcxp_wqe,

				bfa_fcs_lport_ns_util_send_rspn_id, ns);

			bfa_fcs_lport_ns_util_send_rspn_id, ns, BFA_FALSE);

		return;

	}
@@ -4631,10 +4643,11 @@ bfa_fcs_lport_scn_send_scr(void *scn_cbarg, struct bfa_fcxp_s *fcxp_alloced) 
	bfa_trc(port->fcs, port->pid);

	bfa_trc(port->fcs, port->port_cfg.pwwn);



	fcxp = fcxp_alloced ? fcxp_alloced : bfa_fcs_fcxp_alloc(port->fcs);

	fcxp = fcxp_alloced ? fcxp_alloced :

	       bfa_fcs_fcxp_alloc(port->fcs, BFA_TRUE);

	if (!fcxp) {

		bfa_fcs_fcxp_alloc_wait(port->fcs->bfa, &scn->fcxp_wqe,

					bfa_fcs_lport_scn_send_scr, scn);

				bfa_fcs_lport_scn_send_scr, scn, BFA_TRUE);

		return;

	}

	scn->fcxp = fcxp;
@@ -4716,7 +4729,7 @@ bfa_fcs_lport_scn_send_ls_acc(struct bfa_fcs_lport_s *port, 


	bfa_trc(port->fcs, rx_fchs->s_id);



	fcxp = bfa_fcs_fcxp_alloc(port->fcs);

	fcxp = bfa_fcs_fcxp_alloc(port->fcs, BFA_FALSE);

	if (!fcxp)

		return;