fnic: fnic Control Path Trace Utility (abb14148) · Commits · 戴 / test

drivers/scsi/fnic/fnic.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@

		#define DRV_NAME "fnic"
		#define DRV_DESCRIPTION "Cisco FCoE HBA Driver"
		#define DRV_VERSION "1.5.0.45"
		#define DRV_VERSION "1.6.0.10"
		#define PFX DRV_NAME ": "
		#define DFX DRV_NAME "%d: "

drivers/scsi/fnic/fnic_debugfs.c

+202 −36

Original line number	Diff line number	Diff line
		@@ -25,6 +25,21 @@ static struct dentry *fnic_trace_debugfs_file;
		static struct dentry *fnic_trace_enable;
		static struct dentry *fnic_stats_debugfs_root;

		static struct dentry *fnic_fc_trace_debugfs_file;
		static struct dentry *fnic_fc_rdata_trace_debugfs_file;
		static struct dentry *fnic_fc_trace_enable;
		static struct dentry *fnic_fc_trace_clear;

		struct fc_trace_flag_type {
		u8 fc_row_file;
		u8 fc_normal_file;
		u8 fnic_trace;
		u8 fc_trace;
		u8 fc_clear;
		};

		static struct fc_trace_flag_type *fc_trc_flag;

		/*
		* fnic_debugfs_init - Initialize debugfs for fnic debug logging
		*
		@@ -56,6 +71,18 @@ int fnic_debugfs_init(void)
		return rc;
		}

		/* Allocate memory to structure */
		fc_trc_flag = (struct fc_trace_flag_type *)
		vmalloc(sizeof(struct fc_trace_flag_type));

		if (fc_trc_flag) {
		fc_trc_flag->fc_row_file = 0;
		fc_trc_flag->fc_normal_file = 1;
		fc_trc_flag->fnic_trace = 2;
		fc_trc_flag->fc_trace = 3;
		fc_trc_flag->fc_clear = 4;
		}

		rc = 0;
		return rc;
		}
		@@ -74,15 +101,19 @@ void fnic_debugfs_terminate(void)

		debugfs_remove(fnic_trace_debugfs_root);
		fnic_trace_debugfs_root = NULL;

		if (fc_trc_flag)
		vfree(fc_trc_flag);
		}

		/*
		* fnic_trace_ctrl_open - Open the trace_enable file
		* fnic_trace_ctrl_open - Open the trace_enable file for fnic_trace
		* Or Open fc_trace_enable file for fc_trace
		* @inode: The inode pointer.
		* @file: The file pointer to attach the trace enable/disable flag.
		*
		* Description:
		* This routine opens a debugsfs file trace_enable.
		* This routine opens a debugsfs file trace_enable or fc_trace_enable.
		*
		* Returns:
		* This function returns zero if successful.
		@@ -94,15 +125,19 @@ static int fnic_trace_ctrl_open(struct inode inode, struct file filp)
		}

		/*
		* fnic_trace_ctrl_read - Read a trace_enable debugfs file
		* fnic_trace_ctrl_read -
		* Read trace_enable ,fc_trace_enable
		* or fc_trace_clear debugfs file
		* @filp: The file pointer to read from.
		* @ubuf: The buffer to copy the data to.
		* @cnt: The number of bytes to read.
		* @ppos: The position in the file to start reading from.
		*
		* Description:
		* This routine reads value of variable fnic_tracing_enabled
		* and stores into local @buf. It will start reading file at @ppos and
		* This routine reads value of variable fnic_tracing_enabled or
		* fnic_fc_tracing_enabled or fnic_fc_trace_cleared
		* and stores into local @buf.
		* It will start reading file at @ppos and
		* copy up to @cnt of data to @ubuf from @buf.
		*
		* Returns:
		@@ -114,13 +149,25 @@ static ssize_t fnic_trace_ctrl_read(struct file *filp,
		{
		char buf[64];
		int len;
		u8 *trace_type;
		len = 0;
		trace_type = (u8 *)filp->private_data;
		if (*trace_type == fc_trc_flag->fnic_trace)
		len = sprintf(buf, "%u\n", fnic_tracing_enabled);
		else if (*trace_type == fc_trc_flag->fc_trace)
		len = sprintf(buf, "%u\n", fnic_fc_tracing_enabled);
		else if (*trace_type == fc_trc_flag->fc_clear)
		len = sprintf(buf, "%u\n", fnic_fc_trace_cleared);
		else
		pr_err("fnic: Cannot read to any debugfs file\n");

		return simple_read_from_buffer(ubuf, cnt, ppos, buf, len);
		}

		/*
		* fnic_trace_ctrl_write - Write to trace_enable debugfs file
		* fnic_trace_ctrl_write -
		* Write to trace_enable, fc_trace_enable or
		* fc_trace_clear debugfs file
		* @filp: The file pointer to write from.
		* @ubuf: The buffer to copy the data from.
		* @cnt: The number of bytes to write.
		@@ -128,7 +175,8 @@ static ssize_t fnic_trace_ctrl_read(struct file *filp,
		*
		* Description:
		* This routine writes data from user buffer @ubuf to buffer @buf and
		* sets fnic_tracing_enabled value as per user input.
		* sets fc_trace_enable ,tracing_enable or fnic_fc_trace_cleared
		* value as per user input.
		*
		* Returns:
		* This function returns the amount of data that was written.
		@@ -140,6 +188,8 @@ static ssize_t fnic_trace_ctrl_write(struct file *filp,
		char buf[64];
		unsigned long val;
		int ret;
		u8 *trace_type;
		trace_type = (u8 *)filp->private_data;

		if (cnt >= sizeof(buf))
		return -EINVAL;
		@@ -153,12 +203,27 @@ static ssize_t fnic_trace_ctrl_write(struct file *filp,
		if (ret < 0)
		return ret;

		if (*trace_type == fc_trc_flag->fnic_trace)
		fnic_tracing_enabled = val;
		else if (*trace_type == fc_trc_flag->fc_trace)
		fnic_fc_tracing_enabled = val;
		else if (*trace_type == fc_trc_flag->fc_clear)
		fnic_fc_trace_cleared = val;
		else
		pr_err("fnic: cannot write to any debufs file\n");

		(*ppos)++;

		return cnt;
		}

		static const struct file_operations fnic_trace_ctrl_fops = {
		.owner = THIS_MODULE,
		.open = fnic_trace_ctrl_open,
		.read = fnic_trace_ctrl_read,
		.write = fnic_trace_ctrl_write,
		};

		/*
		* fnic_trace_debugfs_open - Open the fnic trace log
		* @inode: The inode pointer
		@@ -178,19 +243,36 @@ static int fnic_trace_debugfs_open(struct inode *inode,
		struct file *file)
		{
		fnic_dbgfs_t *fnic_dbg_prt;
		u8 *rdata_ptr;
		rdata_ptr = (u8 *)inode->i_private;
		fnic_dbg_prt = kzalloc(sizeof(fnic_dbgfs_t), GFP_KERNEL);
		if (!fnic_dbg_prt)
		return -ENOMEM;

		fnic_dbg_prt->buffer = vmalloc((3(trace_max_pages PAGE_SIZE)));
		if (*rdata_ptr == fc_trc_flag->fnic_trace) {
		fnic_dbg_prt->buffer = vmalloc(3 *
		(trace_max_pages * PAGE_SIZE));
		if (!fnic_dbg_prt->buffer) {
		kfree(fnic_dbg_prt);
		return -ENOMEM;
		}
		memset((void *)fnic_dbg_prt->buffer, 0,
		(3(trace_max_pages PAGE_SIZE)));
		3 * (trace_max_pages * PAGE_SIZE));
		fnic_dbg_prt->buffer_len = fnic_get_trace_data(fnic_dbg_prt);
		} else {
		fnic_dbg_prt->buffer =
		vmalloc(3 * (fnic_fc_trace_max_pages * PAGE_SIZE));
		if (!fnic_dbg_prt->buffer) {
		kfree(fnic_dbg_prt);
		return -ENOMEM;
		}
		memset((void *)fnic_dbg_prt->buffer, 0,
		3 * (fnic_fc_trace_max_pages * PAGE_SIZE));
		fnic_dbg_prt->buffer_len =
		fnic_fc_trace_get_data(fnic_dbg_prt, *rdata_ptr);
		}
		file->private_data = fnic_dbg_prt;

		return 0;
		}

		@@ -272,13 +354,6 @@ static int fnic_trace_debugfs_release(struct inode *inode,
		return 0;
		}

		static const struct file_operations fnic_trace_ctrl_fops = {
		.owner = THIS_MODULE,
		.open = fnic_trace_ctrl_open,
		.read = fnic_trace_ctrl_read,
		.write = fnic_trace_ctrl_write,
		};

		static const struct file_operations fnic_trace_debugfs_fops = {
		.owner = THIS_MODULE,
		.open = fnic_trace_debugfs_open,
		@@ -308,7 +383,8 @@ int fnic_trace_debugfs_init(void)
		fnic_trace_enable = debugfs_create_file("tracing_enable",
		S_IFREG\|S_IRUGO\|S_IWUSR,
		fnic_trace_debugfs_root,
		NULL, &fnic_trace_ctrl_fops);
		&(fc_trc_flag->fnic_trace),
		&fnic_trace_ctrl_fops);

		if (!fnic_trace_enable) {
		printk(KERN_DEBUG
		@@ -319,7 +395,7 @@ int fnic_trace_debugfs_init(void)
		fnic_trace_debugfs_file = debugfs_create_file("trace",
		S_IFREG\|S_IRUGO\|S_IWUSR,
		fnic_trace_debugfs_root,
		NULL,
		&(fc_trc_flag->fnic_trace),
		&fnic_trace_debugfs_fops);

		if (!fnic_trace_debugfs_file) {
		@@ -340,14 +416,104 @@ int fnic_trace_debugfs_init(void)
		*/
		void fnic_trace_debugfs_terminate(void)
		{
		if (fnic_trace_debugfs_file) {
		debugfs_remove(fnic_trace_debugfs_file);
		fnic_trace_debugfs_file = NULL;
		}
		if (fnic_trace_enable) {

		debugfs_remove(fnic_trace_enable);
		fnic_trace_enable = NULL;
		}

		/*
		* fnic_fc_trace_debugfs_init -
		* Initialize debugfs for fnic control frame trace logging
		*
		* Description:
		* When Debugfs is configured this routine sets up the fnic_fc debugfs
		* file system. If not already created, this routine will create the
		* create file trace to log fnic fc trace buffer output into debugfs and
		* it will also create file fc_trace_enable to control enable/disable of
		* trace logging into trace buffer.
		*/

		int fnic_fc_trace_debugfs_init(void)
		{
		int rc = -1;

		if (!fnic_trace_debugfs_root) {
		pr_err("fnic:Debugfs root directory doesn't exist\n");
		return rc;
		}

		fnic_fc_trace_enable = debugfs_create_file("fc_trace_enable",
		S_IFREG\|S_IRUGO\|S_IWUSR,
		fnic_trace_debugfs_root,
		&(fc_trc_flag->fc_trace),
		&fnic_trace_ctrl_fops);

		if (!fnic_fc_trace_enable) {
		pr_err("fnic: Failed create fc_trace_enable file\n");
		return rc;
		}

		fnic_fc_trace_clear = debugfs_create_file("fc_trace_clear",
		S_IFREG\|S_IRUGO\|S_IWUSR,
		fnic_trace_debugfs_root,
		&(fc_trc_flag->fc_clear),
		&fnic_trace_ctrl_fops);

		if (!fnic_fc_trace_clear) {
		pr_err("fnic: Failed to create fc_trace_enable file\n");
		return rc;
		}

		fnic_fc_rdata_trace_debugfs_file =
		debugfs_create_file("fc_trace_rdata",
		S_IFREG\|S_IRUGO\|S_IWUSR,
		fnic_trace_debugfs_root,
		&(fc_trc_flag->fc_normal_file),
		&fnic_trace_debugfs_fops);

		if (!fnic_fc_rdata_trace_debugfs_file) {
		pr_err("fnic: Failed create fc_rdata_trace file\n");
		return rc;
		}

		fnic_fc_trace_debugfs_file =
		debugfs_create_file("fc_trace",
		S_IFREG\|S_IRUGO\|S_IWUSR,
		fnic_trace_debugfs_root,
		&(fc_trc_flag->fc_row_file),
		&fnic_trace_debugfs_fops);

		if (!fnic_fc_trace_debugfs_file) {
		pr_err("fnic: Failed to create fc_trace file\n");
		return rc;
		}
		rc = 0;
		return rc;
		}

		/*
		* fnic_fc_trace_debugfs_terminate - Tear down debugfs infrastructure
		*
		* Description:
		* When Debugfs is configured this routine removes debugfs file system
		* elements that are specific to fnic_fc trace logging.
		*/

		void fnic_fc_trace_debugfs_terminate(void)
		{
		debugfs_remove(fnic_fc_trace_debugfs_file);
		fnic_fc_trace_debugfs_file = NULL;

		debugfs_remove(fnic_fc_rdata_trace_debugfs_file);
		fnic_fc_rdata_trace_debugfs_file = NULL;

		debugfs_remove(fnic_fc_trace_enable);
		fnic_fc_trace_enable = NULL;

		debugfs_remove(fnic_fc_trace_clear);
		fnic_fc_trace_clear = NULL;
		}

		/*

drivers/scsi/fnic/fnic_fcs.c

+54 −2

Original line number	Diff line number	Diff line
		@@ -66,19 +66,35 @@ void fnic_handle_link(struct work_struct *work)
		fnic->link_down_cnt = vnic_dev_link_down_cnt(fnic->vdev);

		if (old_link_status == fnic->link_status) {
		if (!fnic->link_status)
		if (!fnic->link_status) {
		/* DOWN -> DOWN */
		spin_unlock_irqrestore(&fnic->fnic_lock, flags);
		else {
		fnic_fc_trace_set_data(fnic->lport->host->host_no,
		FNIC_FC_LE, "Link Status: DOWN->DOWN",
		strlen("Link Status: DOWN->DOWN"));
		} else {
		if (old_link_down_cnt != fnic->link_down_cnt) {
		/* UP -> DOWN -> UP */
		fnic->lport->host_stats.link_failure_count++;
		spin_unlock_irqrestore(&fnic->fnic_lock, flags);
		fnic_fc_trace_set_data(
		fnic->lport->host->host_no,
		FNIC_FC_LE,
		"Link Status:UP_DOWN_UP",
		strlen("Link_Status:UP_DOWN_UP")
		);
		FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host,
		"link down\n");
		fcoe_ctlr_link_down(&fnic->ctlr);
		if (fnic->config.flags & VFCF_FIP_CAPABLE) {
		/* start FCoE VLAN discovery */
		fnic_fc_trace_set_data(
		fnic->lport->host->host_no,
		FNIC_FC_LE,
		"Link Status: UP_DOWN_UP_VLAN",
		strlen(
		"Link Status: UP_DOWN_UP_VLAN")
		);
		fnic_fcoe_send_vlan_req(fnic);
		return;
		}
		@@ -88,22 +104,36 @@ void fnic_handle_link(struct work_struct *work)
		} else
		/* UP -> UP */
		spin_unlock_irqrestore(&fnic->fnic_lock, flags);
		fnic_fc_trace_set_data(
		fnic->lport->host->host_no, FNIC_FC_LE,
		"Link Status: UP_UP",
		strlen("Link Status: UP_UP"));
		}
		} else if (fnic->link_status) {
		/* DOWN -> UP */
		spin_unlock_irqrestore(&fnic->fnic_lock, flags);
		if (fnic->config.flags & VFCF_FIP_CAPABLE) {
		/* start FCoE VLAN discovery */
		fnic_fc_trace_set_data(
		fnic->lport->host->host_no,
		FNIC_FC_LE, "Link Status: DOWN_UP_VLAN",
		strlen("Link Status: DOWN_UP_VLAN"));
		fnic_fcoe_send_vlan_req(fnic);
		return;
		}
		FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host, "link up\n");
		fnic_fc_trace_set_data(fnic->lport->host->host_no, FNIC_FC_LE,
		"Link Status: DOWN_UP", strlen("Link Status: DOWN_UP"));
		fcoe_ctlr_link_up(&fnic->ctlr);
		} else {
		/* UP -> DOWN */
		fnic->lport->host_stats.link_failure_count++;
		spin_unlock_irqrestore(&fnic->fnic_lock, flags);
		FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host, "link down\n");
		fnic_fc_trace_set_data(
		fnic->lport->host->host_no, FNIC_FC_LE,
		"Link Status: UP_DOWN",
		strlen("Link Status: UP_DOWN"));
		fcoe_ctlr_link_down(&fnic->ctlr);
		}

		@@ -611,6 +641,10 @@ static inline int fnic_import_rq_eth_pkt(struct fnic fnic, struct sk_buff skb)
		"using UCSM\n");
		goto drop;
		}
		if ((fnic_fc_trace_set_data(fnic->lport->host->host_no,
		FNIC_FC_RECV\|0x80, (char *)skb->data, skb->len)) != 0) {
		printk(KERN_ERR "fnic ctlr frame trace error!!!");
		}
		skb_queue_tail(&fnic->fip_frame_queue, skb);
		queue_work(fnic_fip_queue, &fnic->fip_frame_work);
		return 1; /* let caller know packet was used */
		@@ -839,6 +873,10 @@ static void fnic_rq_cmpl_frame_recv(struct vnic_rq *rq, struct cq_desc
		}
		fr_dev(fp) = fnic->lport;
		spin_unlock_irqrestore(&fnic->fnic_lock, flags);
		if ((fnic_fc_trace_set_data(fnic->lport->host->host_no, FNIC_FC_RECV,
		(char *)skb->data, skb->len)) != 0) {
		printk(KERN_ERR "fnic ctlr frame trace error!!!");
		}

		skb_queue_tail(&fnic->frame_queue, skb);
		queue_work(fnic_event_queue, &fnic->frame_work);
		@@ -946,6 +984,15 @@ void fnic_eth_send(struct fcoe_ctlr fip, struct sk_buff skb)
		vlan_hdr->h_vlan_proto = htons(ETH_P_8021Q);
		vlan_hdr->h_vlan_encapsulated_proto = eth_hdr->h_proto;
		vlan_hdr->h_vlan_TCI = htons(fnic->vlan_id);
		if ((fnic_fc_trace_set_data(fnic->lport->host->host_no,
		FNIC_FC_SEND\|0x80, (char *)eth_hdr, skb->len)) != 0) {
		printk(KERN_ERR "fnic ctlr frame trace error!!!");
		}
		} else {
		if ((fnic_fc_trace_set_data(fnic->lport->host->host_no,
		FNIC_FC_SEND\|0x80, (char *)skb->data, skb->len)) != 0) {
		printk(KERN_ERR "fnic ctlr frame trace error!!!");
		}
		}

		pa = pci_map_single(fnic->pdev, skb->data, skb->len, PCI_DMA_TODEVICE);
		@@ -1018,6 +1065,11 @@ static int fnic_send_frame(struct fnic fnic, struct fc_frame fp)

		pa = pci_map_single(fnic->pdev, eth_hdr, tot_len, PCI_DMA_TODEVICE);

		if ((fnic_fc_trace_set_data(fnic->lport->host->host_no, FNIC_FC_SEND,
		(char *)eth_hdr, tot_len)) != 0) {
		printk(KERN_ERR "fnic ctlr frame trace error!!!");
		}

		spin_lock_irqsave(&fnic->wq_lock[0], flags);

		if (!vnic_wq_desc_avail(wq)) {

drivers/scsi/fnic/fnic_main.c

+18 −2

Original line number	Diff line number	Diff line
		@@ -74,6 +74,11 @@ module_param(fnic_trace_max_pages, uint, S_IRUGO\|S_IWUSR);
		MODULE_PARM_DESC(fnic_trace_max_pages, "Total allocated memory pages "
		"for fnic trace buffer");

		unsigned int fnic_fc_trace_max_pages = 64;
		module_param(fnic_fc_trace_max_pages, uint, S_IRUGO\|S_IWUSR);
		MODULE_PARM_DESC(fnic_fc_trace_max_pages,
		"Total allocated memory pages for fc trace buffer");

		static unsigned int fnic_max_qdepth = FNIC_DFLT_QUEUE_DEPTH;
		module_param(fnic_max_qdepth, uint, S_IRUGO\|S_IWUSR);
		MODULE_PARM_DESC(fnic_max_qdepth, "Queue depth to report for each LUN");
		@@ -1034,11 +1039,20 @@ static int __init fnic_init_module(void)
		/* Allocate memory for trace buffer */
		err = fnic_trace_buf_init();
		if (err < 0) {
		printk(KERN_ERR PFX "Trace buffer initialization Failed "
		printk(KERN_ERR PFX
		"Trace buffer initialization Failed. "
		"Fnic Tracing utility is disabled\n");
		fnic_trace_free();
		}

		/* Allocate memory for fc trace buffer */
		err = fnic_fc_trace_init();
		if (err < 0) {
		printk(KERN_ERR PFX "FC trace buffer initialization Failed "
		"FC frame tracing utility is disabled\n");
		fnic_fc_trace_free();
		}

		/* Create a cache for allocation of default size sgls */
		len = sizeof(struct fnic_dflt_sgl_list);
		fnic_sgl_cache[FNIC_SGL_CACHE_DFLT] = kmem_cache_create
		@@ -1119,6 +1133,7 @@ err_create_fnic_sgl_slab_max:
		kmem_cache_destroy(fnic_sgl_cache[FNIC_SGL_CACHE_DFLT]);
		err_create_fnic_sgl_slab_dflt:
		fnic_trace_free();
		fnic_fc_trace_free();
		fnic_debugfs_terminate();
		return err;
		}
		@@ -1136,6 +1151,7 @@ static void __exit fnic_cleanup_module(void)
		kmem_cache_destroy(fnic_io_req_cache);
		fc_release_transport(fnic_fc_transport);
		fnic_trace_free();
		fnic_fc_trace_free();
		fnic_debugfs_terminate();
		}

drivers/scsi/fnic/fnic_trace.c

+324 −2

File changed.

Preview size limit exceeded, changes collapsed.

Admin message