Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1047abc1 authored by Steve French's avatar Steve French
Browse files

[CIFS] CIFS Stats improvements 



New cifs_writepages routine was not updated bytes written in cifs stats.
Also added ability to clear /proc/fs/cifs/Stats by writing (0 or 1) to it.
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 4ca9c190

fs/cifs/CHANGES

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ wsize and rsize can now be larger than negotiated buffer size if server 
supports large readx/writex, even when directio mount flag not specified.

Write size will in many cases now be 16K instead of 4K which greatly helps

file copy performance on lightly loaded networks.  Fix oops in dnotify

when experimental config flag enabled.

when experimental config flag enabled. Make cifsFYI more granular.



Version 1.37

------------

fs/cifs/README

+9 −2
Original line number Diff line number Diff line
@@ -482,9 +482,16 @@ These experimental features and tracing can be enabled by changing flags in 
kernel, e.g.  insmod cifs).  To enable a feature set it to 1 e.g.  to enable 

tracing to the kernel message log type: 



	echo 1 > /proc/fs/cifs/cifsFYI

	

and for more extensive tracing including the start of smb requests and responses

	echo 7 > /proc/fs/cifs/cifsFYI

	

cifsFYI functions as a bit mask. Setting it to 1 enables additional kernel

logging of various informational messages.  2 enables logging of non-zero

SMB return codes while 4 enables logging of requests that take longer

than one second to complete (except for byte range lock requests). 

Setting it to 4 requires defining CONFIG_CIFS_STATS2 manually in the

source code (typically by setting it in the beginning of cifsglob.h),

and setting it to seven enables all three.  Finally, tracing

the start of smb requests and responses can be enabled via:



	echo 1 > /proc/fs/cifs/traceSMB

fs/cifs/cifs_debug.c

+48 −1
Original line number Diff line number Diff line
@@ -203,6 +203,49 @@ cifs_debug_data_read(char *buf, char **beginBuffer, off_t offset, 
}



#ifdef CONFIG_CIFS_STATS



static int

cifs_stats_write(struct file *file, const char __user *buffer,

               unsigned long count, void *data)

{

        char c;

        int rc;

	struct list_head *tmp;

	struct cifsTconInfo *tcon;



        rc = get_user(c, buffer);

        if (rc)

                return rc;



        if (c == '1' || c == 'y' || c == 'Y') {

		read_lock(&GlobalSMBSeslock);

		list_for_each(tmp, &GlobalTreeConnectionList) {

			tcon = list_entry(tmp, struct cifsTconInfo,

					cifsConnectionList);

			atomic_set(&tcon->num_smbs_sent, 0);

			atomic_set(&tcon->num_writes, 0);

			atomic_set(&tcon->num_reads, 0);

			atomic_set(&tcon->num_oplock_brks, 0);

			atomic_set(&tcon->num_opens, 0);

			atomic_set(&tcon->num_closes, 0);

			atomic_set(&tcon->num_deletes, 0);

			atomic_set(&tcon->num_mkdirs, 0);

			atomic_set(&tcon->num_rmdirs, 0);

			atomic_set(&tcon->num_renames, 0);

			atomic_set(&tcon->num_t2renames, 0);

			atomic_set(&tcon->num_ffirst, 0);

			atomic_set(&tcon->num_fnext, 0);

			atomic_set(&tcon->num_fclose, 0);

			atomic_set(&tcon->num_hardlinks, 0);

			atomic_set(&tcon->num_symlinks, 0);

			atomic_set(&tcon->num_locks, 0);

		}

		read_unlock(&GlobalSMBSeslock);

	}



        return count;

}



static int

cifs_stats_read(char *buf, char **beginBuffer, off_t offset,

		  int count, int *eof, void *data)
@@ -365,8 +408,10 @@ cifs_proc_init(void) 
				cifs_debug_data_read, NULL);



#ifdef CONFIG_CIFS_STATS

	create_proc_read_entry("Stats", 0, proc_fs_cifs,

	pde = create_proc_read_entry("Stats", 0, proc_fs_cifs,

				cifs_stats_read, NULL);

	if (pde)

		pde->write_proc = cifs_stats_write;

#endif

	pde = create_proc_read_entry("cifsFYI", 0, proc_fs_cifs,

				cifsFYI_read, NULL);
@@ -483,6 +528,8 @@ cifsFYI_write(struct file *file, const char __user *buffer, 
		cifsFYI = 0;

	else if (c == '1' || c == 'y' || c == 'Y')

		cifsFYI = 1;

	else if((c > '1') && (c <= '9'))

		cifsFYI = (int) (c - '0'); /* see cifs_debug.h for meanings */



	return count;

}

fs/cifs/cifs_debug.h

+4 −1
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ 
void cifs_dump_mem(char *label, void *data, int length);

extern int traceSMB;		/* flag which enables the function below */

void dump_smb(struct smb_hdr *, int);

#define CIFS_INFO	0x01

#define CIFS_RC  	0x02

#define CIFS_TIMER	0x04



/*

 *	debug ON
@@ -36,7 +39,7 @@ void dump_smb(struct smb_hdr *, int); 


/* information message: e.g., configuration, major event */

extern int cifsFYI;

#define cifsfyi(format,arg...) if (cifsFYI) printk(KERN_DEBUG " " __FILE__ ": " format "\n" "" , ## arg)

#define cifsfyi(format,arg...) if (cifsFYI & CIFS_INFO) printk(KERN_DEBUG " " __FILE__ ": " format "\n" "" , ## arg)



#define cFYI(button,prspec) if (button) cifsfyi prspec

fs/cifs/cifsglob.h

+5 −1
Original line number Diff line number Diff line
@@ -377,7 +377,11 @@ struct mid_q_entry { 
	__u16 mid;		/* multiplex id */

	__u16 pid;		/* process id */

	__u32 sequence_number;  /* for CIFS signing */

	struct timeval when_sent;	/* time when smb sent */

	unsigned long when_alloc;  /* when mid was created */

#ifdef CONFIG_CIFS_STATS2

	unsigned long when_sent; /* time when smb send finished */

	unsigned long when_received; /* when demux complete (taken off wire) */

#endif

	struct cifsSesInfo *ses;	/* smb was sent to this server */

	struct task_struct *tsk;	/* task waiting for response */

	struct smb_hdr *resp_buf;	/* response buffer */