Commit 84b2ba6e authored by Chad Dupuis's avatar Chad Dupuis Committed by Martin K. Petersen
Browse files

scsi: qedf: Honor priority from DCBX FCoE App tag 



We currently hard code the priority in the 8021q tag to 3 for FCoE
traffic.  The vast majority of the time this is fine but if the priority
is something else besides 3, any VLAN ID comparison either in the
non-offload path or offload path will fail and cause dropped frames
where none are expected.

Change the behavior so that the driver default is 3 if we do not get any
DCBX convergence.

If DCBX does converge, then set the FIP/FCoE priority in the following
manner:

 1. If the qedf_default_prio modparam is set use that
 2. If the DCBX FCoE priority is not in range (0..7) use 3
 3. Use the DCBX FCoE priority we get in the driver's DCBX handler

Signed-off-by: default avatarChad Dupuis <chad.dupuis@cavium.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent ba17d379

drivers/scsi/qedf/qedf.h

+1 −0
Original line number Diff line number Diff line
@@ -301,6 +301,7 @@ struct qedf_ctx { 
#define QEDF_FALLBACK_VLAN	1002

#define QEDF_DEFAULT_PRIO	3

	int vlan_id;

	u8 prio;

	struct qed_dev *cdev;

	struct qed_dev_fcoe_info dev_info;

	struct qed_int_info int_info;

drivers/scsi/qedf/qedf_main.c

+38 −14
Original line number Diff line number Diff line
@@ -54,10 +54,10 @@ module_param_named(fallback_vlan, qedf_fallback_vlan, int, S_IRUGO); 
MODULE_PARM_DESC(fallback_vlan, " VLAN ID to try if fip vlan request fails "

	"(default 1002).");



static uint qedf_default_prio = QEDF_DEFAULT_PRIO;

static int qedf_default_prio = -1;

module_param_named(default_prio, qedf_default_prio, int, S_IRUGO);

MODULE_PARM_DESC(default_prio, " Default 802.1q priority for FIP and FCoE"

	" traffic (default 3).");

MODULE_PARM_DESC(default_prio, " Override 802.1q priority for FIP and FCoE"

	" traffic (value between 0 and 7, default 3).");



uint qedf_dump_frames;

module_param_named(dump_frames, qedf_dump_frames, int, S_IRUGO | S_IWUSR);
@@ -114,9 +114,9 @@ static struct kmem_cache *qedf_io_work_cache; 
void qedf_set_vlan_id(struct qedf_ctx *qedf, int vlan_id)

{

	qedf->vlan_id = vlan_id;

	qedf->vlan_id |= qedf_default_prio << VLAN_PRIO_SHIFT;

	qedf->vlan_id |= qedf->prio << VLAN_PRIO_SHIFT;

	QEDF_INFO(&(qedf->dbg_ctx), QEDF_LOG_DISC, "Setting vlan_id=%04x "

		   "prio=%d.\n", vlan_id, qedf_default_prio);

		   "prio=%d.\n", vlan_id, qedf->prio);

}



/* Returns true if we have a valid vlan, false otherwise */
@@ -532,6 +532,7 @@ static void qedf_link_update(void *dev, struct qed_link_output *link) 
static void qedf_dcbx_handler(void *dev, struct qed_dcbx_get *get, u32 mib_type)

{

	struct qedf_ctx *qedf = (struct qedf_ctx *)dev;

	u8 tmp_prio;



	QEDF_ERR(&(qedf->dbg_ctx), "DCBx event valid=%d enabled=%d fcoe "

	    "prio=%d.\n", get->operational.valid, get->operational.enabled,
@@ -547,6 +548,24 @@ static void qedf_dcbx_handler(void *dev, struct qed_dcbx_get *get, u32 mib_type) 


		atomic_set(&qedf->dcbx, QEDF_DCBX_DONE);



		/*

		 * Set the 8021q priority in the following manner:

		 *

		 * 1. If a modparam is set use that

		 * 2. If the value is not between 0..7 use the default

		 * 3. Use the priority we get from the DCBX app tag

		 */

		tmp_prio = get->operational.app_prio.fcoe;

		if (qedf_default_prio > -1)

			qedf->prio = qedf_default_prio;

		else if (tmp_prio < 0 || tmp_prio > 7) {

			QEDF_INFO(&(qedf->dbg_ctx), QEDF_LOG_DISC,

			    "FIP/FCoE prio %d out of range, setting to %d.\n",

			    tmp_prio, QEDF_DEFAULT_PRIO);

			qedf->prio = QEDF_DEFAULT_PRIO;

		} else

			qedf->prio = tmp_prio;



		if (atomic_read(&qedf->link_state) == QEDF_LINK_UP &&

		    !qedf_dcbx_no_wait) {

			if (atomic_read(&qedf->link_down_tmo_valid) > 0)
@@ -1114,7 +1133,7 @@ static int qedf_offload_connection(struct qedf_ctx *qedf, 
	conn_info.vlan_tag = qedf->vlan_id <<

	    FCOE_CONN_OFFLOAD_RAMROD_DATA_VLAN_ID_SHIFT;

	conn_info.vlan_tag |=

	    qedf_default_prio << FCOE_CONN_OFFLOAD_RAMROD_DATA_PRIORITY_SHIFT;

	    qedf->prio << FCOE_CONN_OFFLOAD_RAMROD_DATA_PRIORITY_SHIFT;

	conn_info.flags |= (FCOE_CONN_OFFLOAD_RAMROD_DATA_B_VLAN_FLAG_MASK <<

	    FCOE_CONN_OFFLOAD_RAMROD_DATA_B_VLAN_FLAG_SHIFT);
@@ -2985,8 +3004,9 @@ static int __qedf_probe(struct pci_dev *pdev, int mode) 
	qedf->link_update_wq = create_workqueue(host_buf);

	INIT_DELAYED_WORK(&qedf->link_update, qedf_handle_link_update);

	INIT_DELAYED_WORK(&qedf->link_recovery, qedf_link_recovery);



	qedf->fipvlan_retries = qedf_fipvlan_retries;

	/* Set a default prio in case DCBX doesn't converge */

	qedf->prio = QEDF_DEFAULT_PRIO;



	/*

	 * Common probe. Takes care of basic hardware init and pci_*
@@ -3412,7 +3432,11 @@ static int __init qedf_init(void) 
	if (qedf_debug == QEDF_LOG_DEFAULT)

		qedf_debug = QEDF_DEFAULT_LOG_MASK;



	/* Check that default prio for FIP/FCoE traffic is between 0..7 */

	/*

	 * Check that default prio for FIP/FCoE traffic is between 0..7 if a

	 * value has been set

	 */

	if (qedf_default_prio > -1)

		if (qedf_default_prio > 7) {

			qedf_default_prio = QEDF_DEFAULT_PRIO;

			QEDF_ERR(NULL, "FCoE/FIP priority out of range, resetting to %d.\n",

CRA Git | Maintained and supported by SUSTech CRA and CCSE