License cleanup: add SPDX GPL-2.0 license identifier to files with no license
Many source files in the tree are missing licensing information, which
makes it harder for compliance tools to determine the correct license.
By default all files without license information are under the default
license of the kernel, which is GPL version 2.
Update the files which contain no license information with the 'GPL-2.0'
SPDX license identifier. The SPDX identifier is a legally binding
shorthand, which can be used instead of the full boiler plate text.
This patch is based on work done by Thomas Gleixner and Kate Stewart and
Philippe Ombredanne.
How this work was done:
Patches were generated and checked against linux-4.14-rc6 for a subset of
the use cases:
- file had no licensing information it it.
- file was a */uapi/* one with no licensing information in it,
- file was a */uapi/* one with existing licensing information,
Further patches will be generated in subsequent months to fix up cases
where non-standard license headers were used, and references to license
had to be inferred by heuristics based on keywords.
The analysis to determine which SPDX License Identifier to be applied to
a file was done in a spreadsheet of side by side results from of the
output of two independent scanners (ScanCode & Windriver) producing SPDX
tag:value files created by Philippe Ombredanne. Philippe prepared the
base worksheet, and did an initial spot review of a few 1000 files.
The 4.13 kernel was the starting point of the analysis with 60,537 files
assessed. Kate Stewart did a file by file comparison of the scanner
results in the spreadsheet to determine which SPDX license identifier(s)
to be applied to the file. She confirmed any determination that was not
immediately clear with lawyers working with the Linux Foundation.
Criteria used to select files for SPDX license identifier tagging was:
- Files considered eligible had to be source code files.
- Make and config files were included as candidates if they contained >5
lines of source
- File already had some variant of a license header in it (even if <5
lines).
All documentation files were explicitly excluded.
The following heuristics were used to determine which SPDX license
identifiers to apply.
- when both scanners couldn't find any license traces, file was
considered to have no license information in it, and the top level
COPYING file license applied.
For non */uapi/* files that summary was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 11139
and resulted in the first patch in this series.
If that file was a */uapi/* path one, it was "GPL-2.0 WITH
Linux-syscall-note" otherwise it was "GPL-2.0". Results of that was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 WITH Linux-syscall-note 930
and resulted in the second patch in this series.
- if a file had some form of licensing information in it, and was one
of the */uapi/* ones, it was denoted with the Linux-syscall-note if
any GPL family license was found in the file or had no licensing in
it (per prior point). Results summary:
SPDX license identifier # files
---------------------------------------------------|------
GPL-2.0 WITH Linux-syscall-note 270
GPL-2.0+ WITH Linux-syscall-note 169
((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) 21
((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 17
LGPL-2.1+ WITH Linux-syscall-note 15
GPL-1.0+ WITH Linux-syscall-note 14
((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) 5
LGPL-2.0+ WITH Linux-syscall-note 4
LGPL-2.1 WITH Linux-syscall-note 3
((GPL-2.0 WITH Linux-syscall-note) OR MIT) 3
((GPL-2.0 WITH Linux-syscall-note) AND MIT) 1
and that resulted in the third patch in this series.
- when the two scanners agreed on the detected license(s), that became
the concluded license(s).
- when there was disagreement between the two scanners (one detected a
license but the other didn't, or they both detected different
licenses) a manual inspection of the file occurred.
- In most cases a manual inspection of the information in the file
resulted in a clear resolution of the license that should apply (and
which scanner probably needed to revisit its heuristics).
- When it was not immediately clear, the license identifier was
confirmed with lawyers working with the Linux Foundation.
- If there was any question as to the appropriate license identifier,
the file was flagged for further research and to be revisited later
in time.
In total, over 70 hours of logged manual review was done on the
spreadsheet to determine the SPDX license identifiers to apply to the
source files by Kate, Philippe, Thomas and, in some cases, confirmation
by lawyers working with the Linux Foundation.
Kate also obtained a third independent scan of the 4.13 code base from
FOSSology, and compared selected files where the other two scanners
disagreed against that SPDX file, to see if there was new insights. The
Windriver scanner is based on an older version of FOSSology in part, so
they are related.
Thomas did random spot checks in about 500 files from the spreadsheets
for the uapi headers and agreed with SPDX license identifier in the
files he inspected. For the non-uapi files Thomas did random spot checks
in about 15000 files.
In initial set of patches against 4.14-rc6, 3 files were found to have
copy/paste license identifier errors, and have been fixed to reflect the
correct identifier.
Additionally Philippe spent 10 hours this week doing a detailed manual
inspection and review of the 12,461 patched files from the initial patch
version early this week with:
- a full scancode scan run, collecting the matched texts, detected
license ids and scores
- reviewing anything where there was a license detected (about 500+
files) to ensure that the applied SPDX license was correct
- reviewing anything where there was no detection but the patch license
was not GPL-2.0 WITH Linux-syscall-note to ensure that the applied
SPDX license was correct
This produced a worksheet with 20 files needing minor correction. This
worksheet was then exported into 3 different .csv files for the
different types of files to be modified.
These .csv files were then reviewed by Greg. Thomas wrote a script to
parse the csv files and add the proper SPDX tag to the file, in the
format that the file expected. This script was further refined by Greg
based on the output to detect more types of files automatically and to
distinguish between header and source .c files (which need different
comment types.) Finally Greg ran the script using the .csv files to
generate the patches.
Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org>
Reviewed-by: Philippe Ombredanne <pombredanne@nexb.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-11-01 22:07:57 +08:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
|
* The USB Monitor, inspired by Dave Harding's USBMon.
|
|
|
|
|
*
|
|
|
|
|
* This is a text format reader.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
|
#include <linux/list.h>
|
|
|
|
|
#include <linux/usb.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 16:04:11 +08:00
|
|
|
#include <linux/slab.h>
|
2017-02-03 02:15:33 +08:00
|
|
|
#include <linux/sched/signal.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/time.h>
|
2015-10-30 13:58:28 +08:00
|
|
|
#include <linux/ktime.h>
|
2011-05-27 21:56:31 +08:00
|
|
|
#include <linux/export.h>
|
2006-01-11 22:55:29 +08:00
|
|
|
#include <linux/mutex.h>
|
USB: add binary API to usbmon
This patch adds a new, "binary" API in addition to the old, text API usbmon
had before. The new API allows for less CPU use, and it allows to capture
all data from a packet where old API only captured 32 bytes at most. There
are some limitations and conditions to this, e.g. in case someone constructs
a URB with 1GB of data, it's not likely to be captured, because even the
huge buffers of the new reader are finite. Nonetheless, I expect this new
capability to capture all data for all real life scenarios.
The downside is, a special user mode application is required where cat(1)
worked before. I have sample code at http://people.redhat.com/zaitcev/linux/
and Paolo Abeni is working on patching libpcap.
This patch was initially written by Paolo and later I tweaked it, and
we had a little back-and-forth. So this is a jointly authored patch, but
I am submitting this I am responsible for the bugs.
Signed-off-by: Paolo Abeni <paolo.abeni@email.it>
Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-12-31 14:43:10 +08:00
|
|
|
#include <linux/debugfs.h>
|
2009-11-07 01:32:23 +08:00
|
|
|
#include <linux/scatterlist.h>
|
2016-12-25 03:46:01 +08:00
|
|
|
#include <linux/uaccess.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
#include "usb_mon.h"
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* No, we do not want arbitrarily long data strings.
|
|
|
|
|
* Use the binary interface if you want to capture bulk data!
|
|
|
|
|
*/
|
|
|
|
|
#define DATA_MAX 32
|
|
|
|
|
|
2005-06-26 05:32:59 +08:00
|
|
|
/*
|
|
|
|
|
* Defined by USB 2.0 clause 9.3, table 9.2.
|
|
|
|
|
*/
|
|
|
|
|
#define SETUP_MAX 8
|
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
|
* This limit exists to prevent OOMs when the user process stops reading.
|
2006-06-10 11:10:10 +08:00
|
|
|
* If usbmon were available to unprivileged processes, it might be open
|
|
|
|
|
* to a local DoS. But we have to keep to root in order to prevent
|
|
|
|
|
* password sniffing from HID devices.
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
2007-02-25 11:27:33 +08:00
|
|
|
#define EVENT_MAX (4*PAGE_SIZE / sizeof(struct mon_event_text))
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-02-25 11:27:33 +08:00
|
|
|
/*
|
|
|
|
|
* Potentially unlimited number; we limit it for similar allocations.
|
|
|
|
|
* The usbfs limits this to 128, but we're not quite as generous.
|
|
|
|
|
*/
|
|
|
|
|
#define ISODESC_MAX 5
|
|
|
|
|
|
|
|
|
|
#define PRINTF_DFL 250 /* with 5 ISOs segs */
|
|
|
|
|
|
|
|
|
|
struct mon_iso_desc {
|
|
|
|
|
int status;
|
|
|
|
|
unsigned int offset;
|
|
|
|
|
unsigned int length; /* Unsigned here, signed in URB. Historic. */
|
|
|
|
|
};
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
struct mon_event_text {
|
|
|
|
|
struct list_head e_link;
|
|
|
|
|
int type; /* submit, complete, etc. */
|
|
|
|
|
unsigned long id; /* From pointer, most of the time */
|
|
|
|
|
unsigned int tstamp;
|
2007-02-25 11:27:33 +08:00
|
|
|
int busnum;
|
2007-08-14 15:33:40 +08:00
|
|
|
char devnum;
|
|
|
|
|
char epnum;
|
|
|
|
|
char is_in;
|
|
|
|
|
char xfertype;
|
2005-04-17 06:20:36 +08:00
|
|
|
int length; /* Depends on type: xfer length or act length */
|
|
|
|
|
int status;
|
2007-02-25 11:27:33 +08:00
|
|
|
int interval;
|
|
|
|
|
int start_frame;
|
|
|
|
|
int error_count;
|
2005-06-26 05:32:59 +08:00
|
|
|
char setup_flag;
|
2005-04-17 06:20:36 +08:00
|
|
|
char data_flag;
|
2007-02-25 11:27:33 +08:00
|
|
|
int numdesc; /* Full number */
|
|
|
|
|
struct mon_iso_desc isodesc[ISODESC_MAX];
|
2005-06-26 05:32:59 +08:00
|
|
|
unsigned char setup[SETUP_MAX];
|
2005-04-17 06:20:36 +08:00
|
|
|
unsigned char data[DATA_MAX];
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#define SLAB_NAME_SZ 30
|
|
|
|
|
struct mon_reader_text {
|
2006-12-07 12:33:20 +08:00
|
|
|
struct kmem_cache *e_slab;
|
2005-04-17 06:20:36 +08:00
|
|
|
int nevents;
|
|
|
|
|
struct list_head e_list;
|
|
|
|
|
struct mon_reader r; /* In C, parent class can be placed anywhere */
|
|
|
|
|
|
|
|
|
|
wait_queue_head_t wait;
|
|
|
|
|
int printf_size;
|
2018-03-09 14:21:14 +08:00
|
|
|
size_t printf_offset;
|
|
|
|
|
size_t printf_togo;
|
2005-04-17 06:20:36 +08:00
|
|
|
char *printf_buf;
|
2006-01-11 22:55:29 +08:00
|
|
|
struct mutex printf_lock;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
char slab_name[SLAB_NAME_SZ];
|
|
|
|
|
};
|
|
|
|
|
|
USB: add binary API to usbmon
This patch adds a new, "binary" API in addition to the old, text API usbmon
had before. The new API allows for less CPU use, and it allows to capture
all data from a packet where old API only captured 32 bytes at most. There
are some limitations and conditions to this, e.g. in case someone constructs
a URB with 1GB of data, it's not likely to be captured, because even the
huge buffers of the new reader are finite. Nonetheless, I expect this new
capability to capture all data for all real life scenarios.
The downside is, a special user mode application is required where cat(1)
worked before. I have sample code at http://people.redhat.com/zaitcev/linux/
and Paolo Abeni is working on patching libpcap.
This patch was initially written by Paolo and later I tweaked it, and
we had a little back-and-forth. So this is a jointly authored patch, but
I am submitting this I am responsible for the bugs.
Signed-off-by: Paolo Abeni <paolo.abeni@email.it>
Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-12-31 14:43:10 +08:00
|
|
|
static struct dentry *mon_dir; /* Usually /sys/kernel/debug/usbmon */
|
|
|
|
|
|
2008-07-26 10:45:34 +08:00
|
|
|
static void mon_text_ctor(void *);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-02-25 11:27:33 +08:00
|
|
|
struct mon_text_ptr {
|
|
|
|
|
int cnt, limit;
|
|
|
|
|
char *pbuf;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static struct mon_event_text *
|
|
|
|
|
mon_text_read_wait(struct mon_reader_text *rp, struct file *file);
|
|
|
|
|
static void mon_text_read_head_t(struct mon_reader_text *rp,
|
|
|
|
|
struct mon_text_ptr *p, const struct mon_event_text *ep);
|
|
|
|
|
static void mon_text_read_head_u(struct mon_reader_text *rp,
|
|
|
|
|
struct mon_text_ptr *p, const struct mon_event_text *ep);
|
|
|
|
|
static void mon_text_read_statset(struct mon_reader_text *rp,
|
|
|
|
|
struct mon_text_ptr *p, const struct mon_event_text *ep);
|
|
|
|
|
static void mon_text_read_intstat(struct mon_reader_text *rp,
|
|
|
|
|
struct mon_text_ptr *p, const struct mon_event_text *ep);
|
|
|
|
|
static void mon_text_read_isostat(struct mon_reader_text *rp,
|
|
|
|
|
struct mon_text_ptr *p, const struct mon_event_text *ep);
|
|
|
|
|
static void mon_text_read_isodesc(struct mon_reader_text *rp,
|
|
|
|
|
struct mon_text_ptr *p, const struct mon_event_text *ep);
|
|
|
|
|
static void mon_text_read_data(struct mon_reader_text *rp,
|
|
|
|
|
struct mon_text_ptr *p, const struct mon_event_text *ep);
|
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
|
* mon_text_submit
|
|
|
|
|
* mon_text_complete
|
|
|
|
|
*
|
|
|
|
|
* May be called from an interrupt.
|
|
|
|
|
*
|
|
|
|
|
* This is called with the whole mon_bus locked, so no additional lock.
|
|
|
|
|
*/
|
|
|
|
|
|
2005-06-26 05:32:59 +08:00
|
|
|
static inline char mon_text_get_setup(struct mon_event_text *ep,
|
2006-08-30 23:35:21 +08:00
|
|
|
struct urb *urb, char ev_type, struct mon_bus *mbus)
|
2005-06-26 05:32:59 +08:00
|
|
|
{
|
|
|
|
|
|
2007-07-31 05:10:36 +08:00
|
|
|
if (ep->xfertype != USB_ENDPOINT_XFER_CONTROL || ev_type != 'S')
|
2005-06-26 05:32:59 +08:00
|
|
|
return '-';
|
|
|
|
|
|
|
|
|
|
if (urb->setup_packet == NULL)
|
|
|
|
|
return 'Z'; /* '0' would be not as pretty. */
|
|
|
|
|
|
|
|
|
|
memcpy(ep->setup, urb->setup_packet, SETUP_MAX);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
static inline char mon_text_get_data(struct mon_event_text *ep, struct urb *urb,
|
2006-08-30 23:35:21 +08:00
|
|
|
int len, char ev_type, struct mon_bus *mbus)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2009-11-07 01:32:23 +08:00
|
|
|
void *src;
|
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
if (len <= 0)
|
|
|
|
|
return 'L';
|
2005-08-16 07:53:57 +08:00
|
|
|
if (len >= DATA_MAX)
|
|
|
|
|
len = DATA_MAX;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-07-31 05:10:36 +08:00
|
|
|
if (ep->is_in) {
|
2007-02-25 11:27:33 +08:00
|
|
|
if (ev_type != 'C')
|
2005-12-04 13:52:10 +08:00
|
|
|
return '<';
|
|
|
|
|
} else {
|
2007-02-25 11:27:33 +08:00
|
|
|
if (ev_type != 'S')
|
2005-12-04 13:52:10 +08:00
|
|
|
return '>';
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
2009-11-07 01:32:23 +08:00
|
|
|
if (urb->num_sgs == 0) {
|
|
|
|
|
src = urb->transfer_buffer;
|
|
|
|
|
if (src == NULL)
|
|
|
|
|
return 'Z'; /* '0' would be not as pretty. */
|
|
|
|
|
} else {
|
2010-05-02 02:20:01 +08:00
|
|
|
struct scatterlist *sg = urb->sg;
|
2009-11-07 01:32:23 +08:00
|
|
|
|
2010-04-03 01:27:28 +08:00
|
|
|
if (PageHighMem(sg_page(sg)))
|
2009-11-07 01:32:23 +08:00
|
|
|
return 'D';
|
|
|
|
|
|
|
|
|
|
/* For the text interface we copy only the first sg buffer */
|
|
|
|
|
len = min_t(int, sg->length, len);
|
|
|
|
|
src = sg_virt(sg);
|
|
|
|
|
}
|
2005-08-16 07:53:57 +08:00
|
|
|
|
2009-11-07 01:32:23 +08:00
|
|
|
memcpy(ep->data, src, len);
|
2005-04-17 06:20:36 +08:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline unsigned int mon_get_timestamp(void)
|
|
|
|
|
{
|
2015-10-30 13:58:28 +08:00
|
|
|
struct timespec64 now;
|
2005-04-17 06:20:36 +08:00
|
|
|
unsigned int stamp;
|
|
|
|
|
|
2015-10-30 13:58:28 +08:00
|
|
|
ktime_get_ts64(&now);
|
|
|
|
|
stamp = now.tv_sec & 0xFFF; /* 2^32 = 4294967296. Limit to 4096s. */
|
|
|
|
|
stamp = stamp * USEC_PER_SEC + now.tv_nsec / NSEC_PER_USEC;
|
2005-04-17 06:20:36 +08:00
|
|
|
return stamp;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void mon_text_event(struct mon_reader_text *rp, struct urb *urb,
|
2007-08-25 03:41:41 +08:00
|
|
|
char ev_type, int status)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
|
struct mon_event_text *ep;
|
|
|
|
|
unsigned int stamp;
|
2007-02-25 11:27:33 +08:00
|
|
|
struct usb_iso_packet_descriptor *fp;
|
|
|
|
|
struct mon_iso_desc *dp;
|
|
|
|
|
int i, ndesc;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
stamp = mon_get_timestamp();
|
|
|
|
|
|
|
|
|
|
if (rp->nevents >= EVENT_MAX ||
|
2006-12-07 12:33:16 +08:00
|
|
|
(ep = kmem_cache_alloc(rp->e_slab, GFP_ATOMIC)) == NULL) {
|
2005-04-17 06:20:36 +08:00
|
|
|
rp->r.m_bus->cnt_text_lost++;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ep->type = ev_type;
|
|
|
|
|
ep->id = (unsigned long) urb;
|
2007-04-12 04:47:26 +08:00
|
|
|
ep->busnum = urb->dev->bus->busnum;
|
2007-07-31 05:10:36 +08:00
|
|
|
ep->devnum = urb->dev->devnum;
|
|
|
|
|
ep->epnum = usb_endpoint_num(&urb->ep->desc);
|
|
|
|
|
ep->xfertype = usb_endpoint_type(&urb->ep->desc);
|
|
|
|
|
ep->is_in = usb_urb_dir_in(urb);
|
2005-04-17 06:20:36 +08:00
|
|
|
ep->tstamp = stamp;
|
|
|
|
|
ep->length = (ev_type == 'S') ?
|
|
|
|
|
urb->transfer_buffer_length : urb->actual_length;
|
|
|
|
|
/* Collecting status makes debugging sense for submits, too */
|
2007-08-25 03:41:41 +08:00
|
|
|
ep->status = status;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-07-31 05:10:36 +08:00
|
|
|
if (ep->xfertype == USB_ENDPOINT_XFER_INT) {
|
2007-02-25 11:27:33 +08:00
|
|
|
ep->interval = urb->interval;
|
2007-07-31 05:10:36 +08:00
|
|
|
} else if (ep->xfertype == USB_ENDPOINT_XFER_ISOC) {
|
2007-02-25 11:27:33 +08:00
|
|
|
ep->interval = urb->interval;
|
|
|
|
|
ep->start_frame = urb->start_frame;
|
|
|
|
|
ep->error_count = urb->error_count;
|
|
|
|
|
}
|
|
|
|
|
ep->numdesc = urb->number_of_packets;
|
2007-07-31 05:10:36 +08:00
|
|
|
if (ep->xfertype == USB_ENDPOINT_XFER_ISOC &&
|
|
|
|
|
urb->number_of_packets > 0) {
|
2007-02-25 11:27:33 +08:00
|
|
|
if ((ndesc = urb->number_of_packets) > ISODESC_MAX)
|
|
|
|
|
ndesc = ISODESC_MAX;
|
|
|
|
|
fp = urb->iso_frame_desc;
|
|
|
|
|
dp = ep->isodesc;
|
|
|
|
|
for (i = 0; i < ndesc; i++) {
|
|
|
|
|
dp->status = fp->status;
|
|
|
|
|
dp->offset = fp->offset;
|
|
|
|
|
dp->length = (ev_type == 'S') ?
|
|
|
|
|
fp->length : fp->actual_length;
|
|
|
|
|
fp++;
|
|
|
|
|
dp++;
|
|
|
|
|
}
|
2011-02-04 13:01:36 +08:00
|
|
|
/* Wasteful, but simple to understand: ISO 'C' is sparse. */
|
|
|
|
|
if (ev_type == 'C')
|
|
|
|
|
ep->length = urb->transfer_buffer_length;
|
2007-02-25 11:27:33 +08:00
|
|
|
}
|
|
|
|
|
|
2006-08-30 23:35:21 +08:00
|
|
|
ep->setup_flag = mon_text_get_setup(ep, urb, ev_type, rp->r.m_bus);
|
|
|
|
|
ep->data_flag = mon_text_get_data(ep, urb, ep->length, ev_type,
|
|
|
|
|
rp->r.m_bus);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
rp->nevents++;
|
|
|
|
|
list_add_tail(&ep->e_link, &rp->e_list);
|
|
|
|
|
wake_up(&rp->wait);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void mon_text_submit(void *data, struct urb *urb)
|
|
|
|
|
{
|
|
|
|
|
struct mon_reader_text *rp = data;
|
2007-08-25 03:41:41 +08:00
|
|
|
mon_text_event(rp, urb, 'S', -EINPROGRESS);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
2007-08-25 03:41:41 +08:00
|
|
|
static void mon_text_complete(void *data, struct urb *urb, int status)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
|
struct mon_reader_text *rp = data;
|
2007-08-25 03:41:41 +08:00
|
|
|
mon_text_event(rp, urb, 'C', status);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
2006-06-10 13:03:32 +08:00
|
|
|
static void mon_text_error(void *data, struct urb *urb, int error)
|
|
|
|
|
{
|
|
|
|
|
struct mon_reader_text *rp = data;
|
|
|
|
|
struct mon_event_text *ep;
|
|
|
|
|
|
|
|
|
|
if (rp->nevents >= EVENT_MAX ||
|
2006-12-07 12:33:16 +08:00
|
|
|
(ep = kmem_cache_alloc(rp->e_slab, GFP_ATOMIC)) == NULL) {
|
2006-06-10 13:03:32 +08:00
|
|
|
rp->r.m_bus->cnt_text_lost++;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ep->type = 'E';
|
|
|
|
|
ep->id = (unsigned long) urb;
|
2010-01-06 02:50:07 +08:00
|
|
|
ep->busnum = urb->dev->bus->busnum;
|
2007-07-31 05:10:36 +08:00
|
|
|
ep->devnum = urb->dev->devnum;
|
|
|
|
|
ep->epnum = usb_endpoint_num(&urb->ep->desc);
|
|
|
|
|
ep->xfertype = usb_endpoint_type(&urb->ep->desc);
|
|
|
|
|
ep->is_in = usb_urb_dir_in(urb);
|
2010-01-06 02:50:07 +08:00
|
|
|
ep->tstamp = mon_get_timestamp();
|
2006-06-10 13:03:32 +08:00
|
|
|
ep->length = 0;
|
|
|
|
|
ep->status = error;
|
|
|
|
|
|
|
|
|
|
ep->setup_flag = '-';
|
|
|
|
|
ep->data_flag = 'E';
|
|
|
|
|
|
|
|
|
|
rp->nevents++;
|
|
|
|
|
list_add_tail(&ep->e_link, &rp->e_list);
|
|
|
|
|
wake_up(&rp->wait);
|
|
|
|
|
}
|
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
|
* Fetch next event from the circular buffer.
|
|
|
|
|
*/
|
|
|
|
|
static struct mon_event_text *mon_text_fetch(struct mon_reader_text *rp,
|
|
|
|
|
struct mon_bus *mbus)
|
|
|
|
|
{
|
|
|
|
|
struct list_head *p;
|
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
|
|
spin_lock_irqsave(&mbus->lock, flags);
|
|
|
|
|
if (list_empty(&rp->e_list)) {
|
|
|
|
|
spin_unlock_irqrestore(&mbus->lock, flags);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
p = rp->e_list.next;
|
|
|
|
|
list_del(p);
|
|
|
|
|
--rp->nevents;
|
|
|
|
|
spin_unlock_irqrestore(&mbus->lock, flags);
|
|
|
|
|
return list_entry(p, struct mon_event_text, e_link);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
*/
|
|
|
|
|
static int mon_text_open(struct inode *inode, struct file *file)
|
|
|
|
|
{
|
|
|
|
|
struct mon_bus *mbus;
|
|
|
|
|
struct mon_reader_text *rp;
|
|
|
|
|
int rc;
|
|
|
|
|
|
2006-01-11 22:55:29 +08:00
|
|
|
mutex_lock(&mon_lock);
|
2006-09-27 16:50:46 +08:00
|
|
|
mbus = inode->i_private;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-02-28 04:29:43 +08:00
|
|
|
rp = kzalloc(sizeof(struct mon_reader_text), GFP_KERNEL);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (rp == NULL) {
|
|
|
|
|
rc = -ENOMEM;
|
|
|
|
|
goto err_alloc;
|
|
|
|
|
}
|
|
|
|
|
INIT_LIST_HEAD(&rp->e_list);
|
|
|
|
|
init_waitqueue_head(&rp->wait);
|
2006-01-11 22:55:29 +08:00
|
|
|
mutex_init(&rp->printf_lock);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
rp->printf_size = PRINTF_DFL;
|
|
|
|
|
rp->printf_buf = kmalloc(rp->printf_size, GFP_KERNEL);
|
|
|
|
|
if (rp->printf_buf == NULL) {
|
|
|
|
|
rc = -ENOMEM;
|
|
|
|
|
goto err_alloc_pr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rp->r.m_bus = mbus;
|
|
|
|
|
rp->r.r_data = rp;
|
|
|
|
|
rp->r.rnf_submit = mon_text_submit;
|
2006-06-10 13:03:32 +08:00
|
|
|
rp->r.rnf_error = mon_text_error;
|
2005-04-17 06:20:36 +08:00
|
|
|
rp->r.rnf_complete = mon_text_complete;
|
|
|
|
|
|
2007-04-12 04:47:26 +08:00
|
|
|
snprintf(rp->slab_name, SLAB_NAME_SZ, "mon_text_%p", rp);
|
2005-04-17 06:20:36 +08:00
|
|
|
rp->e_slab = kmem_cache_create(rp->slab_name,
|
|
|
|
|
sizeof(struct mon_event_text), sizeof(long), 0,
|
2007-07-20 09:11:58 +08:00
|
|
|
mon_text_ctor);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (rp->e_slab == NULL) {
|
|
|
|
|
rc = -ENOMEM;
|
|
|
|
|
goto err_slab;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
mon_reader_add(mbus, &rp->r);
|
|
|
|
|
|
|
|
|
|
file->private_data = rp;
|
2006-01-11 22:55:29 +08:00
|
|
|
mutex_unlock(&mon_lock);
|
2005-04-17 06:20:36 +08:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
// err_busy:
|
|
|
|
|
// kmem_cache_destroy(rp->e_slab);
|
|
|
|
|
err_slab:
|
|
|
|
|
kfree(rp->printf_buf);
|
|
|
|
|
err_alloc_pr:
|
|
|
|
|
kfree(rp);
|
|
|
|
|
err_alloc:
|
2006-01-11 22:55:29 +08:00
|
|
|
mutex_unlock(&mon_lock);
|
2005-04-17 06:20:36 +08:00
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
2018-03-09 14:21:14 +08:00
|
|
|
static ssize_t mon_text_copy_to_user(struct mon_reader_text *rp,
|
|
|
|
|
char __user * const buf, const size_t nbytes)
|
|
|
|
|
{
|
|
|
|
|
const size_t togo = min(nbytes, rp->printf_togo);
|
|
|
|
|
|
|
|
|
|
if (copy_to_user(buf, &rp->printf_buf[rp->printf_offset], togo))
|
|
|
|
|
return -EFAULT;
|
|
|
|
|
rp->printf_togo -= togo;
|
|
|
|
|
rp->printf_offset += togo;
|
|
|
|
|
return togo;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* ppos is not advanced since the llseek operation is not permitted. */
|
2007-02-25 11:27:33 +08:00
|
|
|
static ssize_t mon_text_read_t(struct file *file, char __user *buf,
|
2018-03-09 14:21:14 +08:00
|
|
|
size_t nbytes, loff_t *ppos)
|
2007-02-25 11:27:33 +08:00
|
|
|
{
|
|
|
|
|
struct mon_reader_text *rp = file->private_data;
|
|
|
|
|
struct mon_event_text *ep;
|
|
|
|
|
struct mon_text_ptr ptr;
|
2018-03-09 14:21:14 +08:00
|
|
|
ssize_t ret;
|
2007-02-25 11:27:33 +08:00
|
|
|
|
|
|
|
|
mutex_lock(&rp->printf_lock);
|
2018-03-09 14:21:14 +08:00
|
|
|
|
|
|
|
|
if (rp->printf_togo == 0) {
|
|
|
|
|
|
|
|
|
|
ep = mon_text_read_wait(rp, file);
|
|
|
|
|
if (IS_ERR(ep)) {
|
|
|
|
|
mutex_unlock(&rp->printf_lock);
|
|
|
|
|
return PTR_ERR(ep);
|
|
|
|
|
}
|
|
|
|
|
ptr.cnt = 0;
|
|
|
|
|
ptr.pbuf = rp->printf_buf;
|
|
|
|
|
ptr.limit = rp->printf_size;
|
|
|
|
|
|
|
|
|
|
mon_text_read_head_t(rp, &ptr, ep);
|
|
|
|
|
mon_text_read_statset(rp, &ptr, ep);
|
|
|
|
|
ptr.cnt += snprintf(ptr.pbuf + ptr.cnt, ptr.limit - ptr.cnt,
|
|
|
|
|
" %d", ep->length);
|
|
|
|
|
mon_text_read_data(rp, &ptr, ep);
|
|
|
|
|
|
|
|
|
|
rp->printf_togo = ptr.cnt;
|
|
|
|
|
rp->printf_offset = 0;
|
|
|
|
|
|
|
|
|
|
kmem_cache_free(rp->e_slab, ep);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ret = mon_text_copy_to_user(rp, buf, nbytes);
|
2007-02-25 11:27:33 +08:00
|
|
|
mutex_unlock(&rp->printf_lock);
|
2018-03-09 14:21:14 +08:00
|
|
|
return ret;
|
2007-02-25 11:27:33 +08:00
|
|
|
}
|
|
|
|
|
|
2018-03-09 14:21:14 +08:00
|
|
|
/* ppos is not advanced since the llseek operation is not permitted. */
|
2007-02-25 11:27:33 +08:00
|
|
|
static ssize_t mon_text_read_u(struct file *file, char __user *buf,
|
2018-03-09 14:21:14 +08:00
|
|
|
size_t nbytes, loff_t *ppos)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
|
struct mon_reader_text *rp = file->private_data;
|
2007-02-25 11:27:33 +08:00
|
|
|
struct mon_event_text *ep;
|
|
|
|
|
struct mon_text_ptr ptr;
|
2018-03-09 14:21:14 +08:00
|
|
|
ssize_t ret;
|
2007-02-25 11:27:33 +08:00
|
|
|
|
|
|
|
|
mutex_lock(&rp->printf_lock);
|
|
|
|
|
|
2018-03-09 14:21:14 +08:00
|
|
|
if (rp->printf_togo == 0) {
|
|
|
|
|
|
|
|
|
|
ep = mon_text_read_wait(rp, file);
|
|
|
|
|
if (IS_ERR(ep)) {
|
|
|
|
|
mutex_unlock(&rp->printf_lock);
|
|
|
|
|
return PTR_ERR(ep);
|
|
|
|
|
}
|
|
|
|
|
ptr.cnt = 0;
|
|
|
|
|
ptr.pbuf = rp->printf_buf;
|
|
|
|
|
ptr.limit = rp->printf_size;
|
|
|
|
|
|
|
|
|
|
mon_text_read_head_u(rp, &ptr, ep);
|
|
|
|
|
if (ep->type == 'E') {
|
|
|
|
|
mon_text_read_statset(rp, &ptr, ep);
|
|
|
|
|
} else if (ep->xfertype == USB_ENDPOINT_XFER_ISOC) {
|
|
|
|
|
mon_text_read_isostat(rp, &ptr, ep);
|
|
|
|
|
mon_text_read_isodesc(rp, &ptr, ep);
|
|
|
|
|
} else if (ep->xfertype == USB_ENDPOINT_XFER_INT) {
|
|
|
|
|
mon_text_read_intstat(rp, &ptr, ep);
|
|
|
|
|
} else {
|
|
|
|
|
mon_text_read_statset(rp, &ptr, ep);
|
|
|
|
|
}
|
|
|
|
|
ptr.cnt += snprintf(ptr.pbuf + ptr.cnt, ptr.limit - ptr.cnt,
|
|
|
|
|
" %d", ep->length);
|
|
|
|
|
mon_text_read_data(rp, &ptr, ep);
|
|
|
|
|
|
|
|
|
|
rp->printf_togo = ptr.cnt;
|
|
|
|
|
rp->printf_offset = 0;
|
|
|
|
|
|
|
|
|
|
kmem_cache_free(rp->e_slab, ep);
|
2007-02-25 11:27:33 +08:00
|
|
|
}
|
|
|
|
|
|
2018-03-09 14:21:14 +08:00
|
|
|
ret = mon_text_copy_to_user(rp, buf, nbytes);
|
2007-02-25 11:27:33 +08:00
|
|
|
mutex_unlock(&rp->printf_lock);
|
2018-03-09 14:21:14 +08:00
|
|
|
return ret;
|
2007-02-25 11:27:33 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct mon_event_text *mon_text_read_wait(struct mon_reader_text *rp,
|
|
|
|
|
struct file *file)
|
|
|
|
|
{
|
2005-04-17 06:20:36 +08:00
|
|
|
struct mon_bus *mbus = rp->r.m_bus;
|
|
|
|
|
DECLARE_WAITQUEUE(waita, current);
|
|
|
|
|
struct mon_event_text *ep;
|
|
|
|
|
|
|
|
|
|
add_wait_queue(&rp->wait, &waita);
|
|
|
|
|
set_current_state(TASK_INTERRUPTIBLE);
|
|
|
|
|
while ((ep = mon_text_fetch(rp, mbus)) == NULL) {
|
|
|
|
|
if (file->f_flags & O_NONBLOCK) {
|
|
|
|
|
set_current_state(TASK_RUNNING);
|
|
|
|
|
remove_wait_queue(&rp->wait, &waita);
|
2007-02-25 11:27:33 +08:00
|
|
|
return ERR_PTR(-EWOULDBLOCK);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
/*
|
|
|
|
|
* We do not count nwaiters, because ->release is supposed
|
|
|
|
|
* to be called when all openers are gone only.
|
|
|
|
|
*/
|
|
|
|
|
schedule();
|
|
|
|
|
if (signal_pending(current)) {
|
|
|
|
|
remove_wait_queue(&rp->wait, &waita);
|
2007-02-25 11:27:33 +08:00
|
|
|
return ERR_PTR(-EINTR);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
set_current_state(TASK_INTERRUPTIBLE);
|
|
|
|
|
}
|
|
|
|
|
set_current_state(TASK_RUNNING);
|
|
|
|
|
remove_wait_queue(&rp->wait, &waita);
|
2007-02-25 11:27:33 +08:00
|
|
|
return ep;
|
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-02-25 11:27:33 +08:00
|
|
|
static void mon_text_read_head_t(struct mon_reader_text *rp,
|
|
|
|
|
struct mon_text_ptr *p, const struct mon_event_text *ep)
|
|
|
|
|
{
|
|
|
|
|
char udir, utype;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-07-31 05:10:36 +08:00
|
|
|
udir = (ep->is_in ? 'i' : 'o');
|
|
|
|
|
switch (ep->xfertype) {
|
|
|
|
|
case USB_ENDPOINT_XFER_ISOC: utype = 'Z'; break;
|
|
|
|
|
case USB_ENDPOINT_XFER_INT: utype = 'I'; break;
|
|
|
|
|
case USB_ENDPOINT_XFER_CONTROL: utype = 'C'; break;
|
2005-04-17 06:20:36 +08:00
|
|
|
default: /* PIPE_BULK */ utype = 'B';
|
|
|
|
|
}
|
2007-02-25 11:27:33 +08:00
|
|
|
p->cnt += snprintf(p->pbuf + p->cnt, p->limit - p->cnt,
|
2005-06-26 05:32:59 +08:00
|
|
|
"%lx %u %c %c%c:%03u:%02u",
|
2005-04-17 06:20:36 +08:00
|
|
|
ep->id, ep->tstamp, ep->type,
|
2007-07-31 05:10:36 +08:00
|
|
|
utype, udir, ep->devnum, ep->epnum);
|
2007-02-25 11:27:33 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void mon_text_read_head_u(struct mon_reader_text *rp,
|
|
|
|
|
struct mon_text_ptr *p, const struct mon_event_text *ep)
|
|
|
|
|
{
|
|
|
|
|
char udir, utype;
|
|
|
|
|
|
2007-07-31 05:10:36 +08:00
|
|
|
udir = (ep->is_in ? 'i' : 'o');
|
|
|
|
|
switch (ep->xfertype) {
|
|
|
|
|
case USB_ENDPOINT_XFER_ISOC: utype = 'Z'; break;
|
|
|
|
|
case USB_ENDPOINT_XFER_INT: utype = 'I'; break;
|
|
|
|
|
case USB_ENDPOINT_XFER_CONTROL: utype = 'C'; break;
|
2007-02-25 11:27:33 +08:00
|
|
|
default: /* PIPE_BULK */ utype = 'B';
|
|
|
|
|
}
|
|
|
|
|
p->cnt += snprintf(p->pbuf + p->cnt, p->limit - p->cnt,
|
|
|
|
|
"%lx %u %c %c%c:%d:%03u:%u",
|
|
|
|
|
ep->id, ep->tstamp, ep->type,
|
2007-07-31 05:10:36 +08:00
|
|
|
utype, udir, ep->busnum, ep->devnum, ep->epnum);
|
2007-02-25 11:27:33 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void mon_text_read_statset(struct mon_reader_text *rp,
|
|
|
|
|
struct mon_text_ptr *p, const struct mon_event_text *ep)
|
|
|
|
|
{
|
2005-06-26 05:32:59 +08:00
|
|
|
|
|
|
|
|
if (ep->setup_flag == 0) { /* Setup packet is present and captured */
|
2007-02-25 11:27:33 +08:00
|
|
|
p->cnt += snprintf(p->pbuf + p->cnt, p->limit - p->cnt,
|
2005-06-26 05:32:59 +08:00
|
|
|
" s %02x %02x %04x %04x %04x",
|
|
|
|
|
ep->setup[0],
|
|
|
|
|
ep->setup[1],
|
|
|
|
|
(ep->setup[3] << 8) | ep->setup[2],
|
|
|
|
|
(ep->setup[5] << 8) | ep->setup[4],
|
|
|
|
|
(ep->setup[7] << 8) | ep->setup[6]);
|
|
|
|
|
} else if (ep->setup_flag != '-') { /* Unable to capture setup packet */
|
2007-02-25 11:27:33 +08:00
|
|
|
p->cnt += snprintf(p->pbuf + p->cnt, p->limit - p->cnt,
|
2005-06-26 05:32:59 +08:00
|
|
|
" %c __ __ ____ ____ ____", ep->setup_flag);
|
|
|
|
|
} else { /* No setup for this kind of URB */
|
2007-02-25 11:27:33 +08:00
|
|
|
p->cnt += snprintf(p->pbuf + p->cnt, p->limit - p->cnt,
|
|
|
|
|
" %d", ep->status);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void mon_text_read_intstat(struct mon_reader_text *rp,
|
|
|
|
|
struct mon_text_ptr *p, const struct mon_event_text *ep)
|
|
|
|
|
{
|
|
|
|
|
p->cnt += snprintf(p->pbuf + p->cnt, p->limit - p->cnt,
|
|
|
|
|
" %d:%d", ep->status, ep->interval);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void mon_text_read_isostat(struct mon_reader_text *rp,
|
|
|
|
|
struct mon_text_ptr *p, const struct mon_event_text *ep)
|
|
|
|
|
{
|
|
|
|
|
if (ep->type == 'S') {
|
|
|
|
|
p->cnt += snprintf(p->pbuf + p->cnt, p->limit - p->cnt,
|
|
|
|
|
" %d:%d:%d", ep->status, ep->interval, ep->start_frame);
|
|
|
|
|
} else {
|
|
|
|
|
p->cnt += snprintf(p->pbuf + p->cnt, p->limit - p->cnt,
|
|
|
|
|
" %d:%d:%d:%d",
|
|
|
|
|
ep->status, ep->interval, ep->start_frame, ep->error_count);
|
2005-06-26 05:32:59 +08:00
|
|
|
}
|
2007-02-25 11:27:33 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void mon_text_read_isodesc(struct mon_reader_text *rp,
|
|
|
|
|
struct mon_text_ptr *p, const struct mon_event_text *ep)
|
|
|
|
|
{
|
|
|
|
|
int ndesc; /* Display this many */
|
|
|
|
|
int i;
|
|
|
|
|
const struct mon_iso_desc *dp;
|
|
|
|
|
|
|
|
|
|
p->cnt += snprintf(p->pbuf + p->cnt, p->limit - p->cnt,
|
|
|
|
|
" %d", ep->numdesc);
|
|
|
|
|
ndesc = ep->numdesc;
|
|
|
|
|
if (ndesc > ISODESC_MAX)
|
|
|
|
|
ndesc = ISODESC_MAX;
|
|
|
|
|
if (ndesc < 0)
|
|
|
|
|
ndesc = 0;
|
|
|
|
|
dp = ep->isodesc;
|
|
|
|
|
for (i = 0; i < ndesc; i++) {
|
|
|
|
|
p->cnt += snprintf(p->pbuf + p->cnt, p->limit - p->cnt,
|
|
|
|
|
" %d:%u:%u", dp->status, dp->offset, dp->length);
|
|
|
|
|
dp++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void mon_text_read_data(struct mon_reader_text *rp,
|
|
|
|
|
struct mon_text_ptr *p, const struct mon_event_text *ep)
|
|
|
|
|
{
|
|
|
|
|
int data_len, i;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
if ((data_len = ep->length) > 0) {
|
|
|
|
|
if (ep->data_flag == 0) {
|
2007-02-25 11:27:33 +08:00
|
|
|
p->cnt += snprintf(p->pbuf + p->cnt, p->limit - p->cnt,
|
|
|
|
|
" =");
|
2005-04-17 06:20:36 +08:00
|
|
|
if (data_len >= DATA_MAX)
|
|
|
|
|
data_len = DATA_MAX;
|
|
|
|
|
for (i = 0; i < data_len; i++) {
|
|
|
|
|
if (i % 4 == 0) {
|
2007-02-25 11:27:33 +08:00
|
|
|
p->cnt += snprintf(p->pbuf + p->cnt,
|
|
|
|
|
p->limit - p->cnt,
|
2005-04-17 06:20:36 +08:00
|
|
|
" ");
|
|
|
|
|
}
|
2007-02-25 11:27:33 +08:00
|
|
|
p->cnt += snprintf(p->pbuf + p->cnt,
|
|
|
|
|
p->limit - p->cnt,
|
2005-04-17 06:20:36 +08:00
|
|
|
"%02x", ep->data[i]);
|
|
|
|
|
}
|
2007-02-25 11:27:33 +08:00
|
|
|
p->cnt += snprintf(p->pbuf + p->cnt, p->limit - p->cnt,
|
|
|
|
|
"\n");
|
2005-04-17 06:20:36 +08:00
|
|
|
} else {
|
2007-02-25 11:27:33 +08:00
|
|
|
p->cnt += snprintf(p->pbuf + p->cnt, p->limit - p->cnt,
|
2005-04-17 06:20:36 +08:00
|
|
|
" %c\n", ep->data_flag);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
2007-02-25 11:27:33 +08:00
|
|
|
p->cnt += snprintf(p->pbuf + p->cnt, p->limit - p->cnt, "\n");
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int mon_text_release(struct inode *inode, struct file *file)
|
|
|
|
|
{
|
|
|
|
|
struct mon_reader_text *rp = file->private_data;
|
|
|
|
|
struct mon_bus *mbus;
|
|
|
|
|
/* unsigned long flags; */
|
|
|
|
|
struct list_head *p;
|
|
|
|
|
struct mon_event_text *ep;
|
|
|
|
|
|
2006-01-11 22:55:29 +08:00
|
|
|
mutex_lock(&mon_lock);
|
2006-09-27 16:50:46 +08:00
|
|
|
mbus = inode->i_private;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
if (mbus->nreaders <= 0) {
|
|
|
|
|
printk(KERN_ERR TAG ": consistency error on close\n");
|
2006-01-11 22:55:29 +08:00
|
|
|
mutex_unlock(&mon_lock);
|
2005-04-17 06:20:36 +08:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
mon_reader_del(mbus, &rp->r);
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* In theory, e_list is protected by mbus->lock. However,
|
|
|
|
|
* after mon_reader_del has finished, the following is the case:
|
|
|
|
|
* - we are not on reader list anymore, so new events won't be added;
|
|
|
|
|
* - whole mbus may be dropped if it was orphaned.
|
|
|
|
|
* So, we better not touch mbus.
|
|
|
|
|
*/
|
|
|
|
|
/* spin_lock_irqsave(&mbus->lock, flags); */
|
|
|
|
|
while (!list_empty(&rp->e_list)) {
|
|
|
|
|
p = rp->e_list.next;
|
|
|
|
|
ep = list_entry(p, struct mon_event_text, e_link);
|
|
|
|
|
list_del(p);
|
|
|
|
|
--rp->nevents;
|
|
|
|
|
kmem_cache_free(rp->e_slab, ep);
|
|
|
|
|
}
|
|
|
|
|
/* spin_unlock_irqrestore(&mbus->lock, flags); */
|
|
|
|
|
|
|
|
|
|
kmem_cache_destroy(rp->e_slab);
|
|
|
|
|
kfree(rp->printf_buf);
|
|
|
|
|
kfree(rp);
|
|
|
|
|
|
2006-01-11 22:55:29 +08:00
|
|
|
mutex_unlock(&mon_lock);
|
2005-04-17 06:20:36 +08:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2007-02-25 11:27:33 +08:00
|
|
|
static const struct file_operations mon_fops_text_t = {
|
2005-04-17 06:20:36 +08:00
|
|
|
.owner = THIS_MODULE,
|
|
|
|
|
.open = mon_text_open,
|
|
|
|
|
.llseek = no_llseek,
|
2007-02-25 11:27:33 +08:00
|
|
|
.read = mon_text_read_t,
|
|
|
|
|
.release = mon_text_release,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const struct file_operations mon_fops_text_u = {
|
|
|
|
|
.owner = THIS_MODULE,
|
|
|
|
|
.open = mon_text_open,
|
|
|
|
|
.llseek = no_llseek,
|
|
|
|
|
.read = mon_text_read_u,
|
2005-04-17 06:20:36 +08:00
|
|
|
.release = mon_text_release,
|
|
|
|
|
};
|
|
|
|
|
|
2007-05-04 07:51:16 +08:00
|
|
|
int mon_text_add(struct mon_bus *mbus, const struct usb_bus *ubus)
|
USB: add binary API to usbmon
This patch adds a new, "binary" API in addition to the old, text API usbmon
had before. The new API allows for less CPU use, and it allows to capture
all data from a packet where old API only captured 32 bytes at most. There
are some limitations and conditions to this, e.g. in case someone constructs
a URB with 1GB of data, it's not likely to be captured, because even the
huge buffers of the new reader are finite. Nonetheless, I expect this new
capability to capture all data for all real life scenarios.
The downside is, a special user mode application is required where cat(1)
worked before. I have sample code at http://people.redhat.com/zaitcev/linux/
and Paolo Abeni is working on patching libpcap.
This patch was initially written by Paolo and later I tweaked it, and
we had a little back-and-forth. So this is a jointly authored patch, but
I am submitting this I am responsible for the bugs.
Signed-off-by: Paolo Abeni <paolo.abeni@email.it>
Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-12-31 14:43:10 +08:00
|
|
|
{
|
|
|
|
|
enum { NAMESZ = 10 };
|
|
|
|
|
char name[NAMESZ];
|
2007-05-04 07:51:16 +08:00
|
|
|
int busnum = ubus? ubus->busnum: 0;
|
USB: add binary API to usbmon
This patch adds a new, "binary" API in addition to the old, text API usbmon
had before. The new API allows for less CPU use, and it allows to capture
all data from a packet where old API only captured 32 bytes at most. There
are some limitations and conditions to this, e.g. in case someone constructs
a URB with 1GB of data, it's not likely to be captured, because even the
huge buffers of the new reader are finite. Nonetheless, I expect this new
capability to capture all data for all real life scenarios.
The downside is, a special user mode application is required where cat(1)
worked before. I have sample code at http://people.redhat.com/zaitcev/linux/
and Paolo Abeni is working on patching libpcap.
This patch was initially written by Paolo and later I tweaked it, and
we had a little back-and-forth. So this is a jointly authored patch, but
I am submitting this I am responsible for the bugs.
Signed-off-by: Paolo Abeni <paolo.abeni@email.it>
Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-12-31 14:43:10 +08:00
|
|
|
int rc;
|
|
|
|
|
|
2011-07-07 15:28:21 +08:00
|
|
|
if (mon_dir == NULL)
|
|
|
|
|
return 0;
|
|
|
|
|
|
2007-05-04 07:51:16 +08:00
|
|
|
if (ubus != NULL) {
|
|
|
|
|
rc = snprintf(name, NAMESZ, "%dt", busnum);
|
|
|
|
|
if (rc <= 0 || rc >= NAMESZ)
|
|
|
|
|
goto err_print_t;
|
2018-05-29 23:30:50 +08:00
|
|
|
mbus->dent_t = debugfs_create_file(name, 0600, mon_dir, mbus,
|
2007-05-04 07:51:16 +08:00
|
|
|
&mon_fops_text_t);
|
|
|
|
|
}
|
USB: add binary API to usbmon
This patch adds a new, "binary" API in addition to the old, text API usbmon
had before. The new API allows for less CPU use, and it allows to capture
all data from a packet where old API only captured 32 bytes at most. There
are some limitations and conditions to this, e.g. in case someone constructs
a URB with 1GB of data, it's not likely to be captured, because even the
huge buffers of the new reader are finite. Nonetheless, I expect this new
capability to capture all data for all real life scenarios.
The downside is, a special user mode application is required where cat(1)
worked before. I have sample code at http://people.redhat.com/zaitcev/linux/
and Paolo Abeni is working on patching libpcap.
This patch was initially written by Paolo and later I tweaked it, and
we had a little back-and-forth. So this is a jointly authored patch, but
I am submitting this I am responsible for the bugs.
Signed-off-by: Paolo Abeni <paolo.abeni@email.it>
Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-12-31 14:43:10 +08:00
|
|
|
|
2007-04-12 04:47:26 +08:00
|
|
|
rc = snprintf(name, NAMESZ, "%du", busnum);
|
2007-02-25 11:27:33 +08:00
|
|
|
if (rc <= 0 || rc >= NAMESZ)
|
|
|
|
|
goto err_print_u;
|
2018-05-29 23:30:50 +08:00
|
|
|
mbus->dent_u = debugfs_create_file(name, 0600, mon_dir, mbus,
|
|
|
|
|
&mon_fops_text_u);
|
2007-02-25 11:27:33 +08:00
|
|
|
|
2007-04-12 04:47:26 +08:00
|
|
|
rc = snprintf(name, NAMESZ, "%ds", busnum);
|
USB: add binary API to usbmon
This patch adds a new, "binary" API in addition to the old, text API usbmon
had before. The new API allows for less CPU use, and it allows to capture
all data from a packet where old API only captured 32 bytes at most. There
are some limitations and conditions to this, e.g. in case someone constructs
a URB with 1GB of data, it's not likely to be captured, because even the
huge buffers of the new reader are finite. Nonetheless, I expect this new
capability to capture all data for all real life scenarios.
The downside is, a special user mode application is required where cat(1)
worked before. I have sample code at http://people.redhat.com/zaitcev/linux/
and Paolo Abeni is working on patching libpcap.
This patch was initially written by Paolo and later I tweaked it, and
we had a little back-and-forth. So this is a jointly authored patch, but
I am submitting this I am responsible for the bugs.
Signed-off-by: Paolo Abeni <paolo.abeni@email.it>
Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-12-31 14:43:10 +08:00
|
|
|
if (rc <= 0 || rc >= NAMESZ)
|
|
|
|
|
goto err_print_s;
|
2018-05-29 23:30:50 +08:00
|
|
|
mbus->dent_s = debugfs_create_file(name, 0600, mon_dir, mbus,
|
|
|
|
|
&mon_fops_stat);
|
USB: add binary API to usbmon
This patch adds a new, "binary" API in addition to the old, text API usbmon
had before. The new API allows for less CPU use, and it allows to capture
all data from a packet where old API only captured 32 bytes at most. There
are some limitations and conditions to this, e.g. in case someone constructs
a URB with 1GB of data, it's not likely to be captured, because even the
huge buffers of the new reader are finite. Nonetheless, I expect this new
capability to capture all data for all real life scenarios.
The downside is, a special user mode application is required where cat(1)
worked before. I have sample code at http://people.redhat.com/zaitcev/linux/
and Paolo Abeni is working on patching libpcap.
This patch was initially written by Paolo and later I tweaked it, and
we had a little back-and-forth. So this is a jointly authored patch, but
I am submitting this I am responsible for the bugs.
Signed-off-by: Paolo Abeni <paolo.abeni@email.it>
Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-12-31 14:43:10 +08:00
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
err_print_s:
|
2007-02-25 11:27:33 +08:00
|
|
|
debugfs_remove(mbus->dent_u);
|
|
|
|
|
mbus->dent_u = NULL;
|
|
|
|
|
err_print_u:
|
2007-05-04 07:51:16 +08:00
|
|
|
if (ubus != NULL) {
|
|
|
|
|
debugfs_remove(mbus->dent_t);
|
|
|
|
|
mbus->dent_t = NULL;
|
|
|
|
|
}
|
USB: add binary API to usbmon
This patch adds a new, "binary" API in addition to the old, text API usbmon
had before. The new API allows for less CPU use, and it allows to capture
all data from a packet where old API only captured 32 bytes at most. There
are some limitations and conditions to this, e.g. in case someone constructs
a URB with 1GB of data, it's not likely to be captured, because even the
huge buffers of the new reader are finite. Nonetheless, I expect this new
capability to capture all data for all real life scenarios.
The downside is, a special user mode application is required where cat(1)
worked before. I have sample code at http://people.redhat.com/zaitcev/linux/
and Paolo Abeni is working on patching libpcap.
This patch was initially written by Paolo and later I tweaked it, and
we had a little back-and-forth. So this is a jointly authored patch, but
I am submitting this I am responsible for the bugs.
Signed-off-by: Paolo Abeni <paolo.abeni@email.it>
Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-12-31 14:43:10 +08:00
|
|
|
err_print_t:
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void mon_text_del(struct mon_bus *mbus)
|
|
|
|
|
{
|
2007-02-25 11:27:33 +08:00
|
|
|
debugfs_remove(mbus->dent_u);
|
2018-05-29 23:30:50 +08:00
|
|
|
debugfs_remove(mbus->dent_t);
|
USB: add binary API to usbmon
This patch adds a new, "binary" API in addition to the old, text API usbmon
had before. The new API allows for less CPU use, and it allows to capture
all data from a packet where old API only captured 32 bytes at most. There
are some limitations and conditions to this, e.g. in case someone constructs
a URB with 1GB of data, it's not likely to be captured, because even the
huge buffers of the new reader are finite. Nonetheless, I expect this new
capability to capture all data for all real life scenarios.
The downside is, a special user mode application is required where cat(1)
worked before. I have sample code at http://people.redhat.com/zaitcev/linux/
and Paolo Abeni is working on patching libpcap.
This patch was initially written by Paolo and later I tweaked it, and
we had a little back-and-forth. So this is a jointly authored patch, but
I am submitting this I am responsible for the bugs.
Signed-off-by: Paolo Abeni <paolo.abeni@email.it>
Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-12-31 14:43:10 +08:00
|
|
|
debugfs_remove(mbus->dent_s);
|
|
|
|
|
}
|
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
|
* Slab interface: constructor.
|
|
|
|
|
*/
|
2008-07-26 10:45:34 +08:00
|
|
|
static void mon_text_ctor(void *mem)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
|
/*
|
|
|
|
|
* Nothing to initialize. No, really!
|
|
|
|
|
* So, we fill it with garbage to emulate a reused object.
|
|
|
|
|
*/
|
|
|
|
|
memset(mem, 0xe5, sizeof(struct mon_event_text));
|
|
|
|
|
}
|
|
|
|
|
|
USB: add binary API to usbmon
This patch adds a new, "binary" API in addition to the old, text API usbmon
had before. The new API allows for less CPU use, and it allows to capture
all data from a packet where old API only captured 32 bytes at most. There
are some limitations and conditions to this, e.g. in case someone constructs
a URB with 1GB of data, it's not likely to be captured, because even the
huge buffers of the new reader are finite. Nonetheless, I expect this new
capability to capture all data for all real life scenarios.
The downside is, a special user mode application is required where cat(1)
worked before. I have sample code at http://people.redhat.com/zaitcev/linux/
and Paolo Abeni is working on patching libpcap.
This patch was initially written by Paolo and later I tweaked it, and
we had a little back-and-forth. So this is a jointly authored patch, but
I am submitting this I am responsible for the bugs.
Signed-off-by: Paolo Abeni <paolo.abeni@email.it>
Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-12-31 14:43:10 +08:00
|
|
|
int __init mon_text_init(void)
|
|
|
|
|
{
|
2018-05-29 23:30:50 +08:00
|
|
|
mon_dir = debugfs_create_dir("usbmon", usb_debug_root);
|
USB: add binary API to usbmon
This patch adds a new, "binary" API in addition to the old, text API usbmon
had before. The new API allows for less CPU use, and it allows to capture
all data from a packet where old API only captured 32 bytes at most. There
are some limitations and conditions to this, e.g. in case someone constructs
a URB with 1GB of data, it's not likely to be captured, because even the
huge buffers of the new reader are finite. Nonetheless, I expect this new
capability to capture all data for all real life scenarios.
The downside is, a special user mode application is required where cat(1)
worked before. I have sample code at http://people.redhat.com/zaitcev/linux/
and Paolo Abeni is working on patching libpcap.
This patch was initially written by Paolo and later I tweaked it, and
we had a little back-and-forth. So this is a jointly authored patch, but
I am submitting this I am responsible for the bugs.
Signed-off-by: Paolo Abeni <paolo.abeni@email.it>
Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-12-31 14:43:10 +08:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2007-02-21 02:37:52 +08:00
|
|
|
void mon_text_exit(void)
|
USB: add binary API to usbmon
This patch adds a new, "binary" API in addition to the old, text API usbmon
had before. The new API allows for less CPU use, and it allows to capture
all data from a packet where old API only captured 32 bytes at most. There
are some limitations and conditions to this, e.g. in case someone constructs
a URB with 1GB of data, it's not likely to be captured, because even the
huge buffers of the new reader are finite. Nonetheless, I expect this new
capability to capture all data for all real life scenarios.
The downside is, a special user mode application is required where cat(1)
worked before. I have sample code at http://people.redhat.com/zaitcev/linux/
and Paolo Abeni is working on patching libpcap.
This patch was initially written by Paolo and later I tweaked it, and
we had a little back-and-forth. So this is a jointly authored patch, but
I am submitting this I am responsible for the bugs.
Signed-off-by: Paolo Abeni <paolo.abeni@email.it>
Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-12-31 14:43:10 +08:00
|
|
|
{
|
|
|
|
|
debugfs_remove(mon_dir);
|
|
|
|
|
}
|