Hans de Goede [Mon, 1 Jul 2013 11:00:43 +0000 (13:00 +0200)]
Prepare for 1.0.16-rc2 release
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Tim Roberts [Sun, 30 Jun 2013 07:54:20 +0000 (09:54 +0200)]
Core: Use fputs(3) instead of fprintf(3)
This is a micro-optimisation, but it should make the code easier to understand.
Pete Batard [Sat, 29 Jun 2013 23:32:10 +0000 (00:32 +0100)]
Core: Fix writing of log lines a single fprintf call
*
fb4c208c33788068bbca67bdd6d11127b5be5a26 broke cygwin compilation due to __GCC__ not being defined
* The actual issue is that __GNUC__ rather than __GCC__ should have been used all along
* Also fixes gettimeofday() usage for MinGW/Cygwin
* Also increase log buffer size to 1K, fix a broken fprintf in core.c and sort whitespaces
Toby Gray [Thu, 27 Jun 2013 13:49:21 +0000 (14:49 +0100)]
Core: Make writing of log lines a single fprintf call.
Prior to this change a single line of logging performing several fprintf.
This change gets all the data for a line to be logged in a single
fprintf call. This reduced the chances of writes from another thread
getting intermixed with a log line.
It also makes it easier to change where logs are output to in the future.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 27 Jun 2013 07:33:28 +0000 (09:33 +0200)]
core: Always warn when there are leaked device refs on exit
This check should done with hotplug capable backends too.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Toby Gray [Wed, 26 Jun 2013 15:26:39 +0000 (16:26 +0100)]
Core: Avoid passing uninitialised data down the hotplug pipe.
Due to alignment requirements, libusb_hotplug_message might have
some padding bytes.
This change makes sure that these padding bytes are
initialised. Valgrind no longer complains about passing uninitialised
data to the write system call.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Chris Dickens [Tue, 25 Jun 2013 21:45:07 +0000 (14:45 -0700)]
core.c: Initialize auto_detach_kernel_driver to 0 for new handle
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Wed, 26 Jun 2013 15:13:44 +0000 (17:13 +0200)]
openbsd: Fix memleak in obsd_get_device_list()
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Wed, 26 Jun 2013 14:50:56 +0000 (16:50 +0200)]
core: Only do hotplug cleanup for hotplug capable backends
Xiaofan encountered a crash while testing on openbsd. The main problem here is
libusb_exit doing hotplug cleanup on a non hotplug capable backend.
If the usb_devs list is non empty (*) at libusb_exit time with a non hotplug
capable backend, then the hotplug cleanup code will unref the devices
in the list. Assuming this is the last unref, then libusb_unref_device
will call usbi_disconnect_device, which will try to take the usb_devs_lock,
which is already hold by libusb_exit. Note that if this deadlock was not
there, that we then also would have a double list_del issue.
*) This should never happen, if it does either libusb or the app has a memleak,
or the app still holds a reference to the device. The latter is an application
bug, since device->ctx will be invalid after libusb_exit, so the application
should not hold references after calling libusb_exit.
In this case we have a memleak the libusb openbsd code causing the usb_devs
list to be non empty. This will be fixed in another commit.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Wed, 26 Jun 2013 14:41:22 +0000 (16:41 +0200)]
WinCE: ref result of usbi_get_device_by_session_id()
After the "WinCE: Fix device reference leak which caused crash on
libusb_exit()" commit, the code always unref-s dev after adding it to
discovered_devs. But if dev comes from usbi_get_device_by_session_id()
it is a weak ref and as such should not be unreffed.
Instead of re-adding comlicate ref tracking logic, this patch fixes this with
a libusb_device_ref(dev) of dev comes from usbi_get_device_by_session_id(),
turning the weak ref into a strong ref.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Toby Gray [Mon, 24 Jun 2013 11:31:26 +0000 (12:31 +0100)]
WinCE: Fix device reference leak which caused crash on libusb_exit().
The Windows CE device allocation code has always had a bug where it would
leak references to devices when they are allocated. This commit removes the
reference leak.
This leak was highlighted by the new hotplug code which now triggers a NULL
pointer dereference if not all devices are unreferenced before libusb_exit
is called.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Pete Batard [Thu, 20 Jun 2013 22:00:34 +0000 (23:00 +0100)]
Misc: Update AUTHORS file
Hans de Goede [Thu, 20 Jun 2013 13:18:10 +0000 (15:18 +0200)]
Prepare for 1.0.16-rc1 release
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Colin Walters [Thu, 30 May 2013 17:34:57 +0000 (13:34 -0400)]
autogen.sh: Honor NOCONFIGURE=1
See http://people.gnome.org/~walters/docs/build-api.txt
Hdg: I know this may seem unnecessary since we also have bootstrap.sh, but
the Gnome people are doing continues build testing of Gnome + dependencies
and having all autogen.sh scripts support NOCONFIGURE=1 makes live easier for
them. Note that in return we get "free" continues build-testing and patches
and / or a heads up when we break things.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 20 Jun 2013 11:08:58 +0000 (13:08 +0200)]
sync.c: Remove code duplication
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 20 Jun 2013 10:52:25 +0000 (12:52 +0200)]
sync.c: Do not free an incompleted transfer
Before this patch the code in sync.c would free an incomplete transfer
when libusb_handle_events_completed exits with an error twice in a row.
But we should never free an incomplete transfer, otherwise we may end up
referencing free-ed memory later on.
This patch simply logs an error and keeps on trying until the transfer
completes.
Note that if libusb_handle_events_completed keeps throwing an error the
entire time, without ever completing the transfer, this patch effectively
replaces a potential crash / unspecified behavior, with an endless loop
and logging a ton of errors making clear what is going on.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 20 Jun 2013 10:41:00 +0000 (12:41 +0200)]
Revert "Core: Don't wait for completion if cancel_transfer failed"
This reverts commit
2f5023c41d3176e56bf0abc521b7c5f8b1ac4664.
2f5023c4
was an attempt to fix: https://github.com/libusbx/libusbx/issues/76
As seen in: http://libusbx.1081486.n5.nabble.com/Libusbx-devel-libusb-interrupt-transfer-does-not-return-in-case-of-error-td626.html
[372849.680990] [
0000275b] libusbx: error [reap_for_handle] reap failed error -1 errno=14
[372849.681752] [
0000275b] libusbx: error [handle_events] backend handle_events failed with error -1
[372850.680466] [
0000275b] libusbx: warning [handle_timeout] async cancel failed -5 errno=22
The problem begins with reap_for_handle failing with errno == 14, which is
EFAULT. So the real problem is the application passing in an invalid (or too
short) buffer, and thus is an application bug.
The fix masks this problem, but causes the problem of calling
libusb_transfer_free() on a non finished transfer, so it is no good.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Conflicts:
AUTHORS
libusb/version_nano.h
Ilya Konstantinov [Thu, 20 Jun 2013 10:00:46 +0000 (12:00 +0200)]
Use Android logging when building on Android
Closes #101
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 20 Jun 2013 09:51:38 +0000 (11:51 +0200)]
Linux: Fix get_kernel_driver_active() when another app has claimed the interface
When another app has claimed the interface, IOCTL_USBFS_GETDRIVER will
succeed and report a driver of "usbfs" being attached.
Since this is not a regular kernel-driver (and detach_kernel_driver does
not detach it), get_kernel_driver_active() should return 0 in this case.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Pete Batard [Wed, 19 Jun 2013 21:44:58 +0000 (22:44 +0100)]
Core: fix another compiler warning in libusb_setlocale()
* VS2012 (64 bit) produces the following in strerror.c(156):
warning C4267: '=' : conversion from 'size_t' to 'int', possible loss of data
Ludovic Rousseau [Wed, 19 Jun 2013 11:21:06 +0000 (13:21 +0200)]
Core: fix compiler warning in libusb_setlocale()
Hello,
A small patch for:
strerror.c: In function 'libusb_setlocale':
strerror.c:148: warning: comparison between signed and unsigned
strerror.c:152: warning: comparison between signed and unsigned
--
Dr. Ludovic Rousseau
From
a4144845845cd0a06fb9074ba2d6669ece3a5b1a Mon Sep 17 00:00:00 2001
From: Ludovic Rousseau <ludovic.rousseau+github@gmail.com>
Date: Wed, 19 Jun 2013 13:16:31 +0200
Subject: [PATCH] Core: fix compiler warning in libusb_setlocale()
strerror.c: In function 'libusb_setlocale':
strerror.c:148: warning: comparison between signed and unsigned
strerror.c:152: warning: comparison between signed and unsigned
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Luca Longinotti [Mon, 17 Jun 2013 07:22:23 +0000 (09:22 +0200)]
Fix several -Wconversion warnings from GCC inside the static inline functions.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Fri, 14 Jun 2013 09:06:47 +0000 (11:06 +0200)]
examples: use libusb_set_auto_detach_kernel_driver()
What better way to show how useful libusb_set_auto_detach_kernel_driver() is,
then to use it in our examples?
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 13 Jun 2013 20:37:29 +0000 (22:37 +0200)]
linux_usbfs: Work around a driver binding race in reset handling
I've been seeing these intermittent failures to reclaim an interface after
a device reset. After much debugging and inserting sleeps in strategic
places to make the race window larger I've found the following race:
1) A user is running some software using libusbx which will automatically
detect, and "bind" to, any newly plugged in USB-devices. For example
a virtual machine viewer with automatic USB-redirection
2) The user plugs in a new usb-storage device
3) The usb-storage driver is not yet loaded, udev spawns
"modprobe usb-storage", this blocks on disk-io
4) The libusbx app opens the device, claims all interfaces, does a device-reset
5) While the IOCTL_USBFS_RESET is running the modprobe completes
6) The driver registration blocks on an USB lock held by the reset code path
7) When the reset finishes the driver registration completes and the driver
binds itself to the device, before IOCTL_USBFS_RESET returns to userspace
8) libusbx tries to re-claim all interfaces it had claimed before the reset
9) libusbx fails as usb-storage is now bound to it
This patch works around this issue by simply unbinding the driver for all
interfaces which were claimed before the reset. Normally this is a no-op as
no driver (other then usbfs) can be bound for claimed interfaces before the
reset.
This patch also improves the error logging, and makes libusb_device_reset
properly return an error when re-claiming fails.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 13 Jun 2013 19:49:01 +0000 (21:49 +0200)]
linux_usbfs: Add support for new disconnect-and-claim ioctl
Currently the linux_usbfs detach_kernel_driver_and_claim() helper function
makes 3 system calls:
1) IOCTL_USBFS_GETDRIVER, to check the driver is not usbfs
2) IOCTL_USBFS_DISCONNECT
3) IOCTL_USBFS_CLAIMINTF
Between each of these calls the state of the interface can change, and
things might not work as expected when it does, iow this is inherently racy.
To fix this a new IOCTL_USBFS_DISCONNECT_CLAIM ioctl has been added to the
kernel a while back, which does all 3 in one. This patch adds support for
this ioctl, with a fall back to the old method for kernels lacking this new
ioctl.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 13 Jun 2013 19:21:14 +0000 (21:21 +0200)]
libusb: Add auto-detach-kernel-driver functionality
Add auto-detach-kernel-driver functionality, and a
libusb_set_auto_detach_kernel_driver() function.
Note that I went with a libusb_set_auto_detach_kernel_driver() function,
rather then with a libusb_enable_auto_detach_kernel_driver(), so that apps
can also disable it again. This is necessary to handle 2 corner cases:
1) When an app wants to do a libusb_set_configuration after claiming 1 or
more interfaces, it needs to first release the interface(s), and in this
case libusb_release_interface() should *not* (re-)attach the kernel driver
2) Some usb classes use multiple interfaces for one function, ie usb-audio
devices do this. In this case attaching the driver will fail until all
interfaces are released, so the app should first release all interfaces, and
only then (re-)attach the kernel driver.
auto-detach-kernel-driver functionality is still useful for these apps, since
doing libusb_detach_kernel_driver() followed by libusb_claim_interface() in
2 separate calls is inherently racy, but they need to be able to disable the
auto-detach functionality before releasing interfaces to be able to properly
handle the 2 described corner cases.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Wed, 19 Jun 2013 08:46:19 +0000 (10:46 +0200)]
linux_udev: Fix spelling of guarantee in comment
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Chris Dickens [Fri, 14 Jun 2013 17:54:29 +0000 (10:54 -0700)]
POSIX: Set usbi_pipe to non-blocking by oring O_NONBLOCK to fd flags.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Mon, 17 Jun 2013 06:39:21 +0000 (08:39 +0200)]
linux_udev: Don't free the udev_monitor while the event thread may still use it
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Fri, 14 Jun 2013 09:51:38 +0000 (11:51 +0200)]
linux_udev: Join the hotplug-event-thread when we stop event monitoring
To ensure that it is stopped before we continue (and if later libusb
gets re-initialized start another thread).
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Fri, 14 Jun 2013 09:10:35 +0000 (11:10 +0200)]
libusb_get_bos_descriptor: Don't log an error on devices without a BOS
An error of LIBUSB_ERROR_PIPE simply means the device has no BOS, so don't
log an error to the console for this.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Chris Dickens [Thu, 13 Jun 2013 17:59:11 +0000 (10:59 -0700)]
hotplug: ensure udev monitor fd is non-blocking
Some older versions of udev do not automatically set the udev
monitor fd to non-blocking mode. This patch ensures that this is
always set.
HdG: Get flags then or in O_NONBLOCK and set them, rather then setting flags
to only O_NONBLOCK.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Fri, 14 Jun 2013 07:37:05 +0000 (09:37 +0200)]
linux_udev: Log error code on pthread_create failure
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Ludovic Rousseau [Mon, 10 Jun 2013 13:27:23 +0000 (15:27 +0200)]
Examples: add a missing \n at end of error messages
Hans de Goede [Fri, 7 Jun 2013 18:07:16 +0000 (19:07 +0100)]
Core: Add a libusb_strerror() function
This patch adds the much requested libusb_strerror() function, taking into
account all issues people raised wrt previous attempts.
Criteria / Decisions underlying this implementation:
- Must support translated messages
- Must not use gettext as that does not work well in combination with Windows
(when building with Visual C, or for Windows CE)
- API compatible with FreeBSD and various patched libusb-s floating around
- KISS:
- Do not add any (other) library dependencies
- Do not try to deal with message encodings (iconv), simply always return UTF-8
making encoding the problem of the application using libusb_strerror.
- Defaults to English, so apps which don't want translated messages,
don't need to do anything special
- Defaults to English (with pure ASCII messages), so apps which don't
call libusb_setlocale() don't need to worry about encoding
Hans de Goede [Thu, 6 Jun 2013 17:07:26 +0000 (10:07 -0700)]
Merge pull request #114 from hjelmn/darwin_device_cache
Darwin device cache
Nathan Hjelm [Mon, 20 May 2013 14:20:33 +0000 (08:20 -0600)]
darwin: return correct error code from libusb_get_config_descriptor when the configuration is not found
Nathan Hjelm [Fri, 17 May 2013 04:04:18 +0000 (22:04 -0600)]
darwin: increment the reference counter to the parent device
Nathan Hjelm [Fri, 17 May 2013 02:48:56 +0000 (20:48 -0600)]
darwin: avoid enumerating devices more than once
This patch attempts to avoid enumerating devices multiple times by
keeping a cache of device information (IOUSBDeviceInterface pointers,
device descriptors, etc) between calls to libusb_init(). This should
avoid two potential problems:
1) Devices that respond slowly to DeviceRequest. These devices can
take multiple seconds to respond and they usually respond with
a failure (on older versions of OSX at least). By keeping track
of these devices the penalty for enumerating them will be paid
only once.
2) Repeated enumeration of the same device may cause
IOCreatePlugInInterfaceForService() to fail. The root cause of
this problem is not well understood but might be a leak in
IOUSBFamily.
To clean up the cached device information an atexit() function is
used.
Pete Batard [Wed, 29 May 2013 10:42:05 +0000 (12:42 +0200)]
Windows: Fix broken WDK compilation
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Peter Stuge [Tue, 8 May 2012 17:50:17 +0000 (19:50 +0200)]
examples: Add sam3u_benchmark isochronous example by Harald Welte
Copied with the author's permission under LGPL-2.1 from
usb-benchmark-project/host/benchmark.c in
git://git.gnumonks.org/sam3u-tests.git commit
74959f7ee88f1597286cd435f312a8ff52c56b7e
http://git.gnumonks.org/cgi-bin/gitweb.cgi?p=sam3u-tests.git;a=blob;f=usb-benchmark-project/host/benchmark.c;h=
74959f7ee88f1597286cd435f312a8ff52c56b7e
An Atmel SAM3U test firmware is also available in the above repository.
Conflicts:
.gitignore
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Mon, 27 May 2013 14:31:48 +0000 (16:31 +0200)]
Add BOS descriptor support
Based on earlier work done on this by Maya Erez <merez@codeaurora.org>,
Nathan Hjelm <hjelmn@me.com> and Pete Batard <pete@akeo.ie>.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Mon, 27 May 2013 09:12:28 +0000 (11:12 +0200)]
Add superspeed endpoint companion descriptor support
Based on earlier work done on this by Maya Erez <merez@codeaurora.org>,
Nathan Hjelm <hjelmn@me.com> and Pete Batard <pete@akeo.ie>.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Fri, 24 May 2013 14:15:51 +0000 (16:15 +0200)]
hotplug: Add a hotplug_poll backend function
Apps which were written before hotplug support, may listen for hotplug events
on their own and call libusb_get_device_list on device addition.
In this case libusb_get_device_list will likely return a list without the new
device in there, as the hotplug event thread will still be busy enumerating
the device, which may take a while, or may not even have seen the event yet.
To avoid this add a new hotplug_poll backend function and make
libusb_get_device_list call a this before copying ctx->usb_devs to the user.
In this function the backend should ensure any pending hotplug events are
fully processed before returning.
This patch implements hotplug_poll for linux, it should probably be also
implemented for darwin.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Fri, 24 May 2013 12:40:27 +0000 (14:40 +0200)]
linux: rework hotplug lock handling
I could not find if libudev is completely threadsafe anywhere, so rework
the lock handling to serialize all libudev accesses. This is a preparation
patch for adding hotplug_poll support, see the next patch in this series.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Fri, 24 May 2013 13:52:45 +0000 (15:52 +0200)]
linux: Add a linux_netlink_read_message helper function
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Fri, 24 May 2013 12:03:54 +0000 (14:03 +0200)]
descriptor.c: AlternateSettings are related by InterfaceNumber
A block of AlternateSettings for a certain InterfaceNumber does not necessarily
start with AlternateSetting 0, so check Interface Descriptors belong to
each other by using InterfaceNumber, as specified in the spec.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Toby Gray [Fri, 24 May 2013 08:42:56 +0000 (10:42 +0200)]
WinCE: Add hotplug.c to projects
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Toby Gray [Fri, 24 May 2013 08:38:48 +0000 (10:38 +0200)]
Windows: Add new symbol for libusb_get_port_numbers to def file
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Toby Gray [Fri, 24 May 2013 08:36:20 +0000 (10:36 +0200)]
Hotplug: Make use of HAVE_SYS_TYPES_H define
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Toby Gray [Fri, 24 May 2013 08:35:24 +0000 (10:35 +0200)]
POSIX: Move setting of pipes to non-blocking into usbi_pipe
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Simon Haggett [Mon, 20 May 2013 11:40:43 +0000 (12:40 +0100)]
wince_get_active_config_descriptor() sets host_endian incorrectly
wince_get_active_config_descriptor() retrieves configuration descriptors
as raw bytes, in bus-endian order. Therefore, host_endian should be set
to 0 (as in wince_get_config_descriptor()).
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Fri, 24 May 2013 08:24:57 +0000 (10:24 +0200)]
all: ensure host_endian is always initialized
The get_device_descriptor backend call done from descriptor.c was passing
in an uninitialized host_endian value. Likewise for the windows backend,
host_endian was not being set from get_[active_]config_descriptor.
Since the 2 problem cases are for different backend calls, we were never using
an uninitialized host_endian, still lets set it everywhere for safety,
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 23 May 2013 17:51:07 +0000 (19:51 +0200)]
all: Allow backend to provide a better get_config_descriptor_by_value
Our core get_config_descriptor_by_value is not exactly pretty nor efficient,
allow the backends to provide something better.
Note that the callback signature differs from get_config_descriptor in that
backend owned memory gets returned. This saves a needless malloc + memcpy +
free. If this turns out to be a problem for some backends we can always
change things to work like get_config_descriptor.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 23 May 2013 17:24:48 +0000 (19:24 +0200)]
descriptor.c: Add a raw_desc_to_config helper function
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 23 May 2013 15:20:47 +0000 (17:20 +0200)]
descriptor.c: Consequently check bDescriptorType and bLength everywhere
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 23 May 2013 13:20:12 +0000 (15:20 +0200)]
descriptor.c: Read a full config-desc-header on first config-desc read
For some reason the first get config call to determine the total-length
was only reading 8 of the 9 bytes of a full config-desc-header, which
is weird. The Linux kernel reads the full 9 on the first call, so lets
do that in libusb too. Note that for backends which cache the config this
does not matter.
Also check that we've actually gotten back a full header, before parsing it.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 23 May 2013 12:40:05 +0000 (14:40 +0200)]
all: Make usbi_os_backend.get_[active_]config_descriptor return len
Since commit
5e479f1821d3294fb1cc70c5867c69eca2551de7:
"Core: Avoid short read failures on broken descriptors"
usbi_os_backend.get_[active_]config_descriptor no longer return on error
(under Linux) when returning less bytes then requested. But
libusb_get_[active_]config_descriptor still not only requests wTotalLength
bytes, but also blindly assumes that on success it has gotten wTotalLength
bytes.
This patch fixes this, it changes all usbi_os_backend.get_*config_descriptor
implementations to return the actual length on success and uses this value as
the descriptor size in parse_configuration().
Note that the linux and wince backends were already returning the actual
length and thus are not touched.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 23 May 2013 11:25:08 +0000 (13:25 +0200)]
linux: Properly deal with invalid config.wTotalLength in sysfs
In usbfs wTotalLength can be trusted, in the sense that the kernel simple
has holes in the descriptors file when a device returns a smaller config
descriptor then advertised.
In sysfs this is not the case, sysfs descriptors only contain descriptors
actually returned by the device, with no holes. The kernel does validate
the bLength field of all the descriptors and removes any invalid ones.
So with sysfs we cannot rely on wTotalLength, since we can trust bLength,
this patch searches forward for a descriptor with type of LIBUSB_DT_CONFIG
to find the next config on sysfs.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Wed, 22 May 2013 18:45:26 +0000 (20:45 +0200)]
linux: get_configuration don't return LIBUSB_ERROR_NOT_SUPPORTED with usbfs
We have an implementation of get_configuration with usbfs, so lets use it.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Wed, 22 May 2013 18:38:51 +0000 (20:38 +0200)]
linux: Use cached config descriptors
Use cached config descriptors instead of doing tons file io, because:
- Less fileio is more
- Less code is more, diffstat for this patch:
1 file changed, 128 insertions(+), 307 deletions(-)
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Wed, 22 May 2013 13:57:29 +0000 (15:57 +0200)]
linux: init: Only stop the event monitor if we also started it
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Wed, 22 May 2013 13:48:22 +0000 (15:48 +0200)]
linux: Switch to kernel version check to determine if sysfs can relate devs
We rely on the kernel version for determining capabilities, except for
sysfs_can_relate_devices. This changes sysfs_can_relate_devices over to
a kernel version check to.
This makes things more consistent, removes a whole bunch of code, and since
it stops us from needlessly banging sysfs, it reduces the avarage run time for
the stress test on my system from 21.8 to 16.7 seconds.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Wed, 22 May 2013 13:25:06 +0000 (15:25 +0200)]
linux: Switch to kernel version check to determine if sysfs has descriptors
With the refactoring of the Linux descriptors handling, we only want to use
sysfs descriptors if they have the complete config descriptors (versus just
the active config descriptor), which is the case since Linux 2.6.26.
This means that we will fallback to using the usbfs descriptors for the device
descriptor on Linux 2.6.23 - 2.6.25, which only have the active config
descriptor. This will cause a tiny performance penalty, but only on these
3 kernel versions (which are not used in any still supported Linux distros),
and then only on library init since we now cache everything.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Wed, 22 May 2013 12:52:37 +0000 (14:52 +0200)]
linux: Clear descriptor buffer before read when using usbfs
In usbfs the config descriptors are config.wTotalLength bytes apart, but the
device may actually return a shorter descriptor then advertised, in this
case the kernel will simply skip over any bytes read which the device did
not actually return. Note the kernel will *not* return 0 data, it will simply
leave the memory passed in to the read call as is.
Therefor this patch clears the buffer before calling read, to ensure that
the non existing parts of the descriptors are always properly zero-ed.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Wed, 22 May 2013 10:57:32 +0000 (12:57 +0200)]
linux: Cache the entire descriptors at device-init
Now that the core caches device-descriptors, we end up opening each
usbfs-node or sysfs-descriptors file once on libusb_init anyways.
So we might as well do this on device-init, rather then waiting for the
core to call op_get_device_descriptor. This allows us to simplify the
code in various places.
While we've it open, read the entire file rather then only reading the
device-descriptor. This is practically free, since most of the cost is in
the opening of the file, not in reading it.
Running the stress test, which does 10000 libusb_init calls, takes 21.8 seconds
on avarage on my idle system with 17 usb devices both before and after this
patch, showing that the cost of also reading the config descriptors while
we've the file open is truely neglible.
Note that this patch does not yet use the cached config descriptors, this is
done by a later patch in this series.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Wed, 22 May 2013 10:40:51 +0000 (12:40 +0200)]
linux: Add a _get_usbfs_fd helper function
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Wed, 22 May 2013 10:12:28 +0000 (12:12 +0200)]
usbi_alloc_device: Drop unnecessary memset 0
The memory gets calloc-ed, so there no need to clear it.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Sat, 18 May 2013 12:07:49 +0000 (14:07 +0200)]
linux: Fix host_endian handling
-in 2 cases the passed in host_endian was not being set
-get_config_descriptor was wrongly calling seek_to_next_config with
host_endian set to 1, but the only case where host_endian is 1 is when
reading the device-desc from usbfs, even in usbfs the config descriptors
are in raw format
Note that the 2nd change partly reverts commit
7f2e9f0776386997d2b4c4c47598ab88e3caeb7a
"Linux: Fix usbfs/sysfs config descriptor handling on big-endian"
Which commit msg says: "checked against Documentation/usb/proc_usb_info.txt"
Well guess what, I checked the actual drivers/usb/core/devio.c code
and Documentation/usb/proc_usb_info.txt is *wrong*. I'll send a patch to
update it.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Fri, 17 May 2013 08:42:47 +0000 (10:42 +0200)]
Examples: Fix use of deprecated libusb_get_port_path
While at it also simplify the path printing in listdevs
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Fri, 17 May 2013 08:36:32 +0000 (10:36 +0200)]
core: Add a new public libusb_get_port_numbers function
This new function replaces the now deprecated libusb_get_port_path function,
as that is the only function operating on a libusb_device which also takes
a libusb_context, which is rather inconsistent.
Note we will keep libusb_get_port_path around in the 1.0.x for the forseeable
future for ABI compatibility reasons, but it should not be used in any new
code.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Fri, 17 May 2013 08:07:25 +0000 (10:07 +0200)]
core: Fix handle_events return code on hotplug pipe read error
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Fri, 3 May 2013 19:19:28 +0000 (21:19 +0200)]
usbi_handle_disconnect: Fix race condition leading to double completion
It took me quite a while to debug this, here is a step by step for the race
which I believe is happening in some cases:
1) app calls libusb_submit_transfer
2) libusb_submit_transfer locks itransfer->lock
3) libusb_submit_transfer adds the transfer to the flying list
4) *thread switch*
5) other thread notices POLL_ERR on device fd, calls usbi_handle_disconnect
6) usbi_handle_disconnect find the transfer which is in progress of being
submitted in the flying list
7) usbi_handle_disconnect calls usbi_backend->clear_transfer_priv on the
transfer, this blocks waiting on itransfer->lock
8) *thread switch*
9) libusb_submit_transfer actually tries to submit the transfer now,
calls usbi_backend->submit_transfer, which fails with -ENODEV
10) libusb_submit_transfer *removes* the transfer from the flying list,
unlocks itransfer->lock and returns an error to its caller
11) the caller frees the transfer, meaning the to_cancel pointer in
usbi_handle_disconnect now points to free-ed memory, for extra mayhem
12) *thread switch*
13) usbi_handle_disconnect calls usbi_handle_transfer_completion
14) usbi_handle_transfer_completion tries to remove the transfer from
the flying list *for the 2nd time*
But the first call done from libusb_submit_transfer has already done
this. libusb's list_del looks like this:
static inline void list_del(struct list_head *entry)
{
entry->next->prev = entry->prev;
entry->prev->next = entry->next;
entry->next = entry->prev = NULL;
}
So the first call sets it next and prev to NULL, and then the 2nd call
tries to deref next -> BOOM
For an example backtrace caused by this, see:
https://bugs.freedesktop.org/show_bug.cgi?id=55619#c7
This patch fixes this by letting libusb_submit keep the flying transfers list
locked during submission, so the submission flow changes from:
1) lock flying transfers
add to flying transfers
unlock
2) submit
3) on submission error:
lock flying transfers
remove from flying transfers
unlock
to:
1) lock flying transfers
2) add to flying transfers
3) submit
4) on submission error:
remove from flying transfers
5) unlock
This means that the os backends submit handler now gets called with the
flying transfers lock held! I've looked at all the backends and this should
not be a problem. Only the windows and win-ce backends care about the
flying transfers list at all, and then only in their handle_events handler.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Fri, 3 May 2013 18:19:06 +0000 (20:19 +0200)]
usbi_handle_disconnect: Add some debugging wrt cancelled transfers
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 16 May 2013 20:40:13 +0000 (22:40 +0200)]
linux: linux_get_parent_info: properly propagate malloc errors
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 16 May 2013 20:36:26 +0000 (22:36 +0200)]
listdevs: Also print portpath for non root hubs
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 16 May 2013 20:09:58 +0000 (22:09 +0200)]
All: ref dev->parent_dev
An app can hold a reference to just a leave device, if then an entire
hub goes away, all removed devices will get there final unref, except for
the one ref-ed by the app. If the app then tries to use parent_dev in anyway
after this, we've a use-after-free bug. This fixes this.
Also remove the lets re-enumerate fix for this from libusb_get_port_path,
I'm not sure what the exact idea behind this fix was, but after this patch
it is no longer needed, and this patch also fixes usage of for example
libusb_get_parent().
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 16 May 2013 19:50:50 +0000 (21:50 +0200)]
core: Improve error / debug messages for hotplug pipe handling
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 16 May 2013 19:31:31 +0000 (21:31 +0200)]
linux: Fixup init_count tracking on hotplug init error
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 16 May 2013 19:30:42 +0000 (21:30 +0200)]
linux_udev: linux_start_event_monitor: Properly cleanup on error
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 16 May 2013 19:18:11 +0000 (21:18 +0200)]
linux: Replace should-not-happen checks with asserts
These all really should never happen, so rather then to do error handling
when they do, simple assert them.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 16 May 2013 18:49:01 +0000 (20:49 +0200)]
linux: Not finding a device on hotplug_disconnect is not an error
This can happen if the device gets removed between registering the hot-plug
event handler and initial device enumeration running. So lets turn this
into a debug message to avoid spurious bug-reports.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 16 May 2013 18:46:07 +0000 (20:46 +0200)]
linux: Improve topology related debug messages
And use usbi_dbg, rather then fprintf(stderr, ...
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 16 May 2013 18:37:51 +0000 (20:37 +0200)]
linux: Set device->port_number
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 16 May 2013 15:13:11 +0000 (17:13 +0200)]
linux: Deal with devices being enumerated before their parents are
The linux netlink enumeration code processes devices in readdir order, which
means devices may get enumerated before their parent is, IE on my system
readdir order is (ls -U)
1-1 usb4 2-1.8 6-0:1.0 1-1.4.3 1-1.4.4.1:1.0
2-1 usb5 6-1.4 6-1:1.0 1-1.4.4 1-1.4.4.1:1.1
6-1 usb6 3-0:1.0 2-1.8:1.0 1-0:1.0 1-1.4.4.1:1.2
7-1 usb7 1-1.4.3:1.0 2-1.8:1.1 1-1:1.0
usb1 1-1.4.4.1 1-1.4.4:1.0 2-1.8:1.2 6-1.4:1.0
usb2 1-1.4:1.0 4-0:1.0 7-0:1.0 2-0:1.0
usb3 1-1.4 5-0:1.0 7-1:1.0 2-1:1.0
So 1.4.4.1 will get added (way) before 1.4.4 and indeed:
[ 0.002243] [
00004055] libusbx: debug [linux_get_device_address] scan 1-1.4.4.1
Dev 0x1973bc0 (1-1.4.4.1) has parent (nil)
This patch fixes this by forcing enumeration of the parent from
linux_parent_dev.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 16 May 2013 15:02:08 +0000 (17:02 +0200)]
linux: Move check for a device being added twice to linux_enumerate_device
It is possible for a device to show up between the hotplug code starting to
listen for new devices, and the enumeration of existing devices. This will
cause a device to get enumerated twice.
The next patch in this series adds a different code path which can cause
a device to be enumerated twice, this patch therefor moves the check for
this to linux_enumerate_device, so that this will get caught in all cases.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 16 May 2013 14:56:40 +0000 (16:56 +0200)]
linux: hotplug_enumerate and _disconnect take active_contexts_lock
Take the active_contexts_lock when enumerating over active_contexts.
Note that the active_contexts_lock is taken *before* the hotplug lock, as they
are taken in the same order in the libusb_init path.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 16 May 2013 14:54:02 +0000 (16:54 +0200)]
linux: Replace pthread_mutex with usbi_mutex_static
Boils down to the same thing, but mixing and matching lock types in one
file looks ugly.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 16 May 2013 14:43:24 +0000 (16:43 +0200)]
core: Fixup default_context handling
Now that we set the default context earlier in libusb_init:
-There is no need to do it a second time at the end of libusb_init
-We need to set it to NULL if libusb_init fails later on
-Since it now can be set then reset by libusb_init, libusb_exit needs to
take the lock while testing if the passed in ctx == default_context
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 16 May 2013 14:38:41 +0000 (16:38 +0200)]
core: Fixup cleanup on init error
-mutexes were not being destroyed on backend init failure
-hotplug_cbs_lock mutex was never being destroyed
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 16 May 2013 14:32:33 +0000 (16:32 +0200)]
core: Add ctx to the active context list before backend->init
As soon as backend->init has completed hotplug events may fire, and they
will not get processed on the created context until it has been added
to the active_context list.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 16 May 2013 14:21:23 +0000 (16:21 +0200)]
linux: Take hotplug_lock for scan_devices, hotplug_enumerate and _disconnect
As soon as we've started listening for hp events, hotplug_enumerate and
_disconnect can run, they do test then add / remove operations on the
device list. This can race with scan_devices adding devices, so take
the lock around all 3 to avoid the race.
Also fix the lock not being released in case of linux_start_event_monitor
failure.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 16 May 2013 13:02:12 +0000 (15:02 +0200)]
linux: linux_parent_dev search for . from the right
If hubs are chained to other hubs there will be multiple '.' characters, and
want the last one.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede [Thu, 16 May 2013 11:08:58 +0000 (13:08 +0200)]
configure: Fix --enable-udev help text
We use AC_ARG_ENABLE so the help string should be --enable-udev, so that
the user knows to pass --disable-udev to disable udev
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Nathan Hjelm [Wed, 15 May 2013 13:54:53 +0000 (07:54 -0600)]
linux: fix topology
Find the parent dev by removing the last number after the . or -
(and prepending with usb if only one number is left) and comparing
it against the sysfs_dir or previously scanned devices.
HdG: Drop hardcoded special casing of root-hubs, this is fixed in a better
way in a later commit.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Nathan Hjelm [Wed, 15 May 2013 01:25:55 +0000 (19:25 -0600)]
darwin: fix topology
The parent device should always already be in the context when a
device is processed. Use the parent device's location to find the
parent dev.
Note: we might want to replicate the notion of a locationID in the
core. If done right the parent dev could be determined in the core.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Nathan Hjelm [Sat, 8 Dec 2012 02:55:21 +0000 (19:55 -0700)]
darwin: clean up extraneous includes
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Pete Batard [Wed, 15 May 2013 15:39:47 +0000 (17:39 +0200)]
Add hotplugtest to msvc project files
Pete Batard [Wed, 15 May 2013 15:34:01 +0000 (17:34 +0200)]
Misc fixes
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Peter Stuge [Tue, 8 May 2012 17:22:31 +0000 (19:22 +0200)]
examples: Only check for HAVE_SIGACTION once in Makefile.am
Signed-off-by: Hans de Goede <hdegoede@redhat.com>