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

[SCSI] bfa: Add support for max target ports discovery 



- Changes to avoid discovering NPIV port as remote port by the other
  NPIV ports created on same physical port when all the NPIV ports are
  part of the same zone in a fabric.
- Provided mechanism to support maximum number of target ports for a
  given initiator port (physical port + NPIV ports) irrespective of the
  way in which the initiator and target ports are zoned in the fabric.
- Introduced module_parameter max_rport_logins to restrict number of
  remote ports discovery which includes target and initiator remote ports.

Signed-off-by: default avatarVijaya Mohan Guvva <vmohan@brocade.com>
Signed-off-by: default avatarKrishna Gudipati <kgudipat@brocade.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent ce7242b8

drivers/scsi/bfa/bfa_fcpim.c

+11 −1
Original line number Diff line number Diff line
@@ -1466,7 +1466,13 @@ bfa_status_t 
bfa_itnim_get_ioprofile(struct bfa_itnim_s *itnim,

			struct bfa_itnim_ioprofile_s *ioprofile)

{

	struct bfa_fcpim_s *fcpim = BFA_FCPIM(itnim->bfa);

	struct bfa_fcpim_s *fcpim;



	if (!itnim)

		return BFA_STATUS_NO_FCPIM_NEXUS;



	fcpim = BFA_FCPIM(itnim->bfa);



	if (!fcpim->io_profile)

		return BFA_STATUS_IOPROFILE_OFF;
@@ -1484,6 +1490,10 @@ void 
bfa_itnim_clear_stats(struct bfa_itnim_s *itnim)

{

	int j;



	if (!itnim)

		return;



	memset(&itnim->stats, 0, sizeof(itnim->stats));

	memset(&itnim->ioprofile, 0, sizeof(itnim->ioprofile));

	for (j = 0; j < BFA_IOBUCKET_MAX; j++)

drivers/scsi/bfa/bfa_fcs.c

+6 −2
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ bfa_fcs_attach(struct bfa_fcs_s *fcs, struct bfa_s *bfa, struct bfad_s *bfad, 
	fcs->bfa = bfa;

	fcs->bfad = bfad;

	fcs->min_cfg = min_cfg;

	fcs->num_rport_logins = 0;



	bfa->fcs = BFA_TRUE;

	fcbuild_init();
@@ -1384,8 +1385,11 @@ bfa_fcs_fabric_uf_recv(struct bfa_fcs_fabric_s *fabric, struct fchs_s *fchs, 
			return;

		}

	}

	bfa_trc(fabric->fcs, els_cmd->els_code);



	if (!bfa_fcs_fabric_is_switched(fabric))

		bfa_fcs_lport_uf_recv(&fabric->bport, fchs, len);



	bfa_trc(fabric->fcs, fchs->type);

}



/*

drivers/scsi/bfa/bfa_fcs.h

+24 −4
Original line number Diff line number Diff line
@@ -64,8 +64,7 @@ struct bfa_fcs_s; 
#define	BFA_FCS_RETRY_TIMEOUT 2000

#define BFA_FCS_MAX_NS_RETRIES 5

#define BFA_FCS_PID_IS_WKA(pid)  ((bfa_ntoh3b(pid) > 0xFFF000) ?  1 : 0)





#define BFA_FCS_MAX_RPORT_LOGINS 1024



struct bfa_fcs_lport_ns_s {

	bfa_sm_t        sm;		/*  state machine */
@@ -472,7 +471,7 @@ struct bfa_fcs_rport_s *bfa_fcs_rport_lookup(struct bfa_fcs_lport_s *port, 
struct bfa_fcs_rport_s *bfa_fcs_rport_lookup_by_nwwn(

	struct bfa_fcs_lport_s *port, wwn_t rnwwn);

void bfa_fcs_rport_set_del_timeout(u8 rport_tmo);



void bfa_fcs_rport_set_max_logins(u32 max_logins);

void bfa_fcs_rport_uf_recv(struct bfa_fcs_rport_s *rport,

	 struct fchs_s *fchs, u16 len);

void bfa_fcs_rport_scn(struct bfa_fcs_rport_s *rport);
@@ -606,7 +605,7 @@ bfa_status_t bfa_fcs_itnim_stats_clear(struct bfa_fcs_lport_s *port, 
struct bfa_fcs_itnim_s *bfa_fcs_itnim_create(struct bfa_fcs_rport_s *rport);

void bfa_fcs_itnim_delete(struct bfa_fcs_itnim_s *itnim);

void bfa_fcs_itnim_rport_offline(struct bfa_fcs_itnim_s *itnim);

void bfa_fcs_itnim_rport_online(struct bfa_fcs_itnim_s *itnim);

void bfa_fcs_itnim_brp_online(struct bfa_fcs_itnim_s *itnim);

bfa_status_t bfa_fcs_itnim_get_online_state(struct bfa_fcs_itnim_s *itnim);

void bfa_fcs_itnim_is_initiator(struct bfa_fcs_itnim_s *itnim);

void bfa_fcs_fcpim_uf_recv(struct bfa_fcs_itnim_s *itnim,
@@ -690,6 +689,7 @@ struct bfa_fcs_s { 
	struct bfa_fcs_stats_s	stats;	/*  FCS statistics */

	struct bfa_wc_s		wc;	/*  waiting counter */

	int			fcs_aen_seq;

	u32		num_rport_logins;

};



/*
@@ -744,6 +744,26 @@ enum rport_event { 
	RPSM_EVENT_ADDRESS_DISC = 16,   /*  Need to Discover rport's PID */

	RPSM_EVENT_PRLO_RCVD   = 17,    /*  PRLO from remote device     */

	RPSM_EVENT_PLOGI_RETRY = 18,    /*  Retry PLOGI continuously */

	RPSM_EVENT_FC4_FCS_ONLINE = 19, /*!< FC-4 FCS online complete */

};



/*

 * fcs_itnim_sm FCS itnim state machine events

 */

enum bfa_fcs_itnim_event {

	BFA_FCS_ITNIM_SM_FCS_ONLINE = 1,        /*  rport online event */

	BFA_FCS_ITNIM_SM_OFFLINE = 2,   /*  rport offline */

	BFA_FCS_ITNIM_SM_FRMSENT = 3,   /*  prli frame is sent */

	BFA_FCS_ITNIM_SM_RSP_OK = 4,    /*  good response */

	BFA_FCS_ITNIM_SM_RSP_ERROR = 5, /*  error response */

	BFA_FCS_ITNIM_SM_TIMEOUT = 6,   /*  delay timeout */

	BFA_FCS_ITNIM_SM_HCB_OFFLINE = 7, /*  BFA online callback */

	BFA_FCS_ITNIM_SM_HCB_ONLINE = 8, /*  BFA offline callback */

	BFA_FCS_ITNIM_SM_INITIATOR = 9, /*  rport is initiator */

	BFA_FCS_ITNIM_SM_DELETE = 10,   /*  delete event from rport */

	BFA_FCS_ITNIM_SM_PRLO = 11,     /*  delete event from rport */

	BFA_FCS_ITNIM_SM_RSP_NOT_SUPP = 12, /* cmd not supported rsp */

	BFA_FCS_ITNIM_SM_HAL_ONLINE = 13, /*!< bfa rport online event */

};



/*

drivers/scsi/bfa/bfa_fcs_fcpim.c

+68 −56
Original line number Diff line number Diff line
@@ -40,25 +40,6 @@ static void bfa_fcs_itnim_prli_response(void *fcsarg, 
static void	bfa_fcs_itnim_aen_post(struct bfa_fcs_itnim_s *itnim,

			enum bfa_itnim_aen_event event);



/*

 *  fcs_itnim_sm FCS itnim state machine events

 */



enum bfa_fcs_itnim_event {

	BFA_FCS_ITNIM_SM_ONLINE = 1,	/*  rport online event */

	BFA_FCS_ITNIM_SM_OFFLINE = 2,	/*  rport offline */

	BFA_FCS_ITNIM_SM_FRMSENT = 3,	/*  prli frame is sent */

	BFA_FCS_ITNIM_SM_RSP_OK = 4,	/*  good response */

	BFA_FCS_ITNIM_SM_RSP_ERROR = 5,	/*  error response */

	BFA_FCS_ITNIM_SM_TIMEOUT = 6,	/*  delay timeout */

	BFA_FCS_ITNIM_SM_HCB_OFFLINE = 7, /*  BFA online callback */

	BFA_FCS_ITNIM_SM_HCB_ONLINE = 8, /*  BFA offline callback */

	BFA_FCS_ITNIM_SM_INITIATOR = 9,	/*  rport is initiator */

	BFA_FCS_ITNIM_SM_DELETE = 10,	/*  delete event from rport */

	BFA_FCS_ITNIM_SM_PRLO = 11,	/*  delete event from rport */

	BFA_FCS_ITNIM_SM_RSP_NOT_SUPP = 12, /* cmd not supported rsp */

};



static void	bfa_fcs_itnim_sm_offline(struct bfa_fcs_itnim_s *itnim,

					 enum bfa_fcs_itnim_event event);

static void	bfa_fcs_itnim_sm_prli_send(struct bfa_fcs_itnim_s *itnim,
@@ -69,6 +50,8 @@ static void bfa_fcs_itnim_sm_prli_retry(struct bfa_fcs_itnim_s *itnim, 
					    enum bfa_fcs_itnim_event event);

static void	bfa_fcs_itnim_sm_hcb_online(struct bfa_fcs_itnim_s *itnim,

					    enum bfa_fcs_itnim_event event);

static void	bfa_fcs_itnim_sm_hal_rport_online(struct bfa_fcs_itnim_s *itnim,

					enum bfa_fcs_itnim_event event);

static void	bfa_fcs_itnim_sm_online(struct bfa_fcs_itnim_s *itnim,

					enum bfa_fcs_itnim_event event);

static void	bfa_fcs_itnim_sm_hcb_offline(struct bfa_fcs_itnim_s *itnim,
@@ -99,7 +82,7 @@ bfa_fcs_itnim_sm_offline(struct bfa_fcs_itnim_s *itnim, 
	bfa_trc(itnim->fcs, event);



	switch (event) {

	case BFA_FCS_ITNIM_SM_ONLINE:

	case BFA_FCS_ITNIM_SM_FCS_ONLINE:

		bfa_sm_set_state(itnim, bfa_fcs_itnim_sm_prli_send);

		itnim->prli_retries = 0;

		bfa_fcs_itnim_send_prli(itnim, NULL);
@@ -138,6 +121,7 @@ bfa_fcs_itnim_sm_prli_send(struct bfa_fcs_itnim_s *itnim, 
	case BFA_FCS_ITNIM_SM_INITIATOR:

		bfa_sm_set_state(itnim, bfa_fcs_itnim_sm_initiator);

		bfa_fcxp_walloc_cancel(itnim->fcs->bfa, &itnim->fcxp_wqe);

		bfa_sm_send_event(itnim->rport, RPSM_EVENT_FC4_FCS_ONLINE);

		break;



	case BFA_FCS_ITNIM_SM_OFFLINE:
@@ -166,12 +150,13 @@ bfa_fcs_itnim_sm_prli(struct bfa_fcs_itnim_s *itnim, 


	switch (event) {

	case BFA_FCS_ITNIM_SM_RSP_OK:

		if (itnim->rport->scsi_function == BFA_RPORT_INITIATOR) {

		if (itnim->rport->scsi_function == BFA_RPORT_INITIATOR)

			bfa_sm_set_state(itnim, bfa_fcs_itnim_sm_initiator);

		} else {

			bfa_sm_set_state(itnim, bfa_fcs_itnim_sm_hcb_online);

			bfa_itnim_online(itnim->bfa_itnim, itnim->seq_rec);

		}

		else

			bfa_sm_set_state(itnim,

				bfa_fcs_itnim_sm_hal_rport_online);



		bfa_sm_send_event(itnim->rport, RPSM_EVENT_FC4_FCS_ONLINE);

		break;



	case BFA_FCS_ITNIM_SM_RSP_ERROR:
@@ -194,6 +179,7 @@ bfa_fcs_itnim_sm_prli(struct bfa_fcs_itnim_s *itnim, 
	case BFA_FCS_ITNIM_SM_INITIATOR:

		bfa_sm_set_state(itnim, bfa_fcs_itnim_sm_initiator);

		bfa_fcxp_discard(itnim->fcxp);

		bfa_sm_send_event(itnim->rport, RPSM_EVENT_FC4_FCS_ONLINE);

		break;



	case BFA_FCS_ITNIM_SM_DELETE:
@@ -207,6 +193,44 @@ bfa_fcs_itnim_sm_prli(struct bfa_fcs_itnim_s *itnim, 
	}

}



static void

bfa_fcs_itnim_sm_hal_rport_online(struct bfa_fcs_itnim_s *itnim,

				enum bfa_fcs_itnim_event event)

{

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

	bfa_trc(itnim->fcs, event);



	switch (event) {

	case BFA_FCS_ITNIM_SM_HAL_ONLINE:

		if (!itnim->bfa_itnim)

			itnim->bfa_itnim = bfa_itnim_create(itnim->fcs->bfa,

					itnim->rport->bfa_rport, itnim);



		if (itnim->bfa_itnim) {

			bfa_sm_set_state(itnim, bfa_fcs_itnim_sm_hcb_online);

			bfa_itnim_online(itnim->bfa_itnim, itnim->seq_rec);

		} else {

			bfa_sm_set_state(itnim, bfa_fcs_itnim_sm_offline);

			bfa_sm_send_event(itnim->rport, RPSM_EVENT_DELETE);

		}



		break;



	case BFA_FCS_ITNIM_SM_OFFLINE:

		bfa_sm_set_state(itnim, bfa_fcs_itnim_sm_offline);

		bfa_sm_send_event(itnim->rport, RPSM_EVENT_FC4_OFFLINE);

		break;



	case BFA_FCS_ITNIM_SM_DELETE:

		bfa_sm_set_state(itnim, bfa_fcs_itnim_sm_offline);

		bfa_fcs_itnim_free(itnim);

		break;



	default:

		bfa_sm_fault(itnim->fcs, event);

	}

}



static void

bfa_fcs_itnim_sm_prli_retry(struct bfa_fcs_itnim_s *itnim,

			    enum bfa_fcs_itnim_event event)
@@ -238,6 +262,7 @@ bfa_fcs_itnim_sm_prli_retry(struct bfa_fcs_itnim_s *itnim, 
	case BFA_FCS_ITNIM_SM_INITIATOR:

		bfa_sm_set_state(itnim, bfa_fcs_itnim_sm_initiator);

		bfa_timer_stop(&itnim->timer);

		bfa_sm_send_event(itnim->rport, RPSM_EVENT_FC4_FCS_ONLINE);

		break;



	case BFA_FCS_ITNIM_SM_DELETE:
@@ -275,9 +300,8 @@ bfa_fcs_itnim_sm_hcb_online(struct bfa_fcs_itnim_s *itnim, 
		break;



	case BFA_FCS_ITNIM_SM_OFFLINE:

		bfa_sm_set_state(itnim, bfa_fcs_itnim_sm_offline);

		bfa_sm_set_state(itnim, bfa_fcs_itnim_sm_hcb_offline);

		bfa_itnim_offline(itnim->bfa_itnim);

		bfa_sm_send_event(itnim->rport, RPSM_EVENT_FC4_OFFLINE);

		break;



	case BFA_FCS_ITNIM_SM_DELETE:
@@ -372,8 +396,14 @@ bfa_fcs_itnim_sm_initiator(struct bfa_fcs_itnim_s *itnim, 
		bfa_sm_send_event(itnim->rport, RPSM_EVENT_FC4_OFFLINE);

		break;



	/*

	 * fcs_online is expected here for well known initiator ports

	 */

	case BFA_FCS_ITNIM_SM_FCS_ONLINE:

		bfa_sm_send_event(itnim->rport, RPSM_EVENT_FC4_FCS_ONLINE);

		break;



	case BFA_FCS_ITNIM_SM_RSP_ERROR:

	case BFA_FCS_ITNIM_SM_ONLINE:

	case BFA_FCS_ITNIM_SM_INITIATOR:

		break;
@@ -532,7 +562,11 @@ bfa_fcs_itnim_timeout(void *arg) 
static void

bfa_fcs_itnim_free(struct bfa_fcs_itnim_s *itnim)

{

	if (itnim->bfa_itnim) {

		bfa_itnim_delete(itnim->bfa_itnim);

		itnim->bfa_itnim = NULL;

	}



	bfa_fcb_itnim_free(itnim->fcs->bfad, itnim->itnim_drv);

}
@@ -553,7 +587,6 @@ bfa_fcs_itnim_create(struct bfa_fcs_rport_s *rport) 
	struct bfa_fcs_lport_s *port = rport->port;

	struct bfa_fcs_itnim_s *itnim;

	struct bfad_itnim_s   *itnim_drv;

	struct bfa_itnim_s *bfa_itnim;



	/*

	 * call bfad to allocate the itnim
@@ -571,20 +604,7 @@ bfa_fcs_itnim_create(struct bfa_fcs_rport_s *rport) 
	itnim->fcs = rport->fcs;

	itnim->itnim_drv = itnim_drv;



	/*

	 * call BFA to create the itnim

	 */

	bfa_itnim =

		bfa_itnim_create(port->fcs->bfa, rport->bfa_rport, itnim);



	if (bfa_itnim == NULL) {

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

		bfa_fcb_itnim_free(port->fcs->bfad, itnim_drv);

		WARN_ON(1);

		return NULL;

	}



	itnim->bfa_itnim     = bfa_itnim;

	itnim->bfa_itnim     = NULL;

	itnim->seq_rec	     = BFA_FALSE;

	itnim->rec_support   = BFA_FALSE;

	itnim->conf_comp     = BFA_FALSE;
@@ -614,20 +634,12 @@ bfa_fcs_itnim_delete(struct bfa_fcs_itnim_s *itnim) 
 * Notification from rport that PLOGI is complete to initiate FC-4 session.

 */

void

bfa_fcs_itnim_rport_online(struct bfa_fcs_itnim_s *itnim)

bfa_fcs_itnim_brp_online(struct bfa_fcs_itnim_s *itnim)

{

	itnim->stats.onlines++;



	if (!BFA_FCS_PID_IS_WKA(itnim->rport->pid)) {

		bfa_sm_send_event(itnim, BFA_FCS_ITNIM_SM_ONLINE);

	} else {

		/*

		 *  For well known addresses, we set the itnim to initiator

		 *  state

		 */

		itnim->stats.initiator++;

		bfa_sm_send_event(itnim, BFA_FCS_ITNIM_SM_INITIATOR);

	}

	if (!BFA_FCS_PID_IS_WKA(itnim->rport->pid))

		bfa_sm_send_event(itnim, BFA_FCS_ITNIM_SM_HAL_ONLINE);

}



/*

drivers/scsi/bfa/bfa_fcs_lport.c

+45 −1
Original line number Diff line number Diff line
@@ -4691,6 +4691,10 @@ bfa_fcs_lport_ns_process_gidft_pids(struct bfa_fcs_lport_s *port, u32 *pid_buf, 
	struct fcgs_gidft_resp_s *gidft_entry;

	struct bfa_fcs_rport_s *rport;

	u32        ii;

	struct bfa_fcs_fabric_s *fabric = port->fabric;

	struct bfa_fcs_vport_s *vport;

	struct list_head *qe;

	u8 found = 0;



	for (ii = 0; ii < n_pids; ii++) {

		gidft_entry = (struct fcgs_gidft_resp_s *) &pid_buf[ii];
@@ -4698,6 +4702,29 @@ bfa_fcs_lport_ns_process_gidft_pids(struct bfa_fcs_lport_s *port, u32 *pid_buf, 
		if (gidft_entry->pid == port->pid)

			continue;



		/*

		 * Ignore PID if it is of base port

		 * (Avoid vports discovering base port as remote port)

		 */

		if (gidft_entry->pid == fabric->bport.pid)

			continue;



		/*

		 * Ignore PID if it is of vport created on the same base port

		 * (Avoid vport discovering every other vport created on the

		 * same port as remote port)

		 */

		list_for_each(qe, &fabric->vport_q) {

			vport = (struct bfa_fcs_vport_s *) qe;

			if (vport->lport.pid == gidft_entry->pid)

				found = 1;

		}



		if (found) {

			found = 0;

			continue;

		}



		/*

		 * Check if this rport already exists

		 */
@@ -4765,6 +4792,7 @@ bfa_fcs_lport_ns_query(struct bfa_fcs_lport_s *port) 
	struct bfa_fcs_lport_ns_s *ns = BFA_FCS_GET_NS_FROM_PORT(port);



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

	if (bfa_sm_cmp_state(ns, bfa_fcs_lport_ns_sm_online))

		bfa_sm_send_event(ns, NSSM_EVENT_NS_QUERY);

}
@@ -5183,9 +5211,25 @@ static void 
bfa_fcs_lport_scn_portid_rscn(struct bfa_fcs_lport_s *port, u32 rpid)

{

	struct bfa_fcs_rport_s *rport;

	struct bfa_fcs_fabric_s *fabric = port->fabric;

	struct bfa_fcs_vport_s *vport;

	struct list_head *qe;



	bfa_trc(port->fcs, rpid);



	/*

	 * Ignore PID if it is of base port or of vports created on the

	 * same base port. It is to avoid vports discovering base port or

	 * other vports created on same base port as remote port

	 */

	if (rpid == fabric->bport.pid)

		return;



	list_for_each(qe, &fabric->vport_q) {

		vport = (struct bfa_fcs_vport_s *) qe;

		if (vport->lport.pid == rpid)

			return;

	}

	/*

	 * If this is an unknown device, then it just came online.

	 * Otherwise let rport handle the RSCN event.

CRA Git | Maintained and supported by SUSTech CRA and CCSE