linux-stable.git/drivers/usb/storage, branch v3.4

usb: storage: fix lockdep warning inside usb_stor_pre_reset(v2)

2012-04-06T20:54:00+00:00

This patch fixes one lockdep warning[1] inside usb_stor_pre_reset.

If the current configuration includes multiple mass storage interfaces,
the 'AA' lockdep warning will be triggered since the lock class of
'us->dev_mutex' is acquired two times in .reset path. It isn't
a real deadlock, so just take the lockdep_set_class annotation to
remove the warning.

[1], lockdep warning log
:[ INFO: possible recursive locking detected ]
:3.3.0-0.rc5.git3.1.fc17.x86_64 #1 Tainted: G        W
:---------------------------------------------
:usb-storage/14846 is trying to acquire lock:
: (&(us->dev_mutex)){+.+.+.}, at: [] usb_stor_pre_reset+0x1c/0x20 [usb_storage]
:but task is already holding lock:
: (&(us->dev_mutex)){+.+.+.}, at: [] usb_stor_pre_reset+0x1c/0x20 [usb_storage]
:other info that might help us debug this:
: Possible unsafe locking scenario:
:       CPU0
:       ----
:  lock(&(us->dev_mutex));
:  lock(&(us->dev_mutex));
: *** DEADLOCK ***
: May be due to missing lock nesting notation
:2 locks held by usb-storage/14846:
: #0:  (&__lockdep_no_validate__){......}, at: [] usb_lock_device_for_reset+0x95/0x100
: #1:  (&(us->dev_mutex)){+.+.+.}, at: [] usb_stor_pre_reset+0x1c/0x20 [usb_storage]
:stack backtrace:
:Pid: 14846, comm: usb-storage Tainted: G        W 3.3.0-0.rc5.git3.1.fc17.x86_64 #1
:Call Trace:
: [] __lock_acquire+0x168f/0x1bb0
: [] ? native_sched_clock+0x13/0x80
: [] ? sched_clock+0x9/0x10
: [] ? sched_clock+0x9/0x10
: [] ? sched_clock_local+0x25/0xa0
: [] lock_acquire+0xa1/0x1e0
: [] ? usb_stor_pre_reset+0x1c/0x20 [usb_storage]
: [] mutex_lock_nested+0x76/0x3a0
: [] ? usb_stor_pre_reset+0x1c/0x20 [usb_storage]
: [] ? usb_stor_pre_reset+0x1c/0x20 [usb_storage]
: [] usb_stor_pre_reset+0x1c/0x20 [usb_storage]
: [] usb_reset_device+0x7d/0x190
: [] usb_stor_port_reset+0x7c/0x80 [usb_storage]
: [] usb_stor_invoke_transport+0x94/0x560 [usb_storage]
: [] ? mark_held_locks+0xb2/0x130
: [] ? _raw_spin_unlock_irq+0x30/0x50
: [] usb_stor_transparent_scsi_command+0xe/0x10 [usb_storage]
: [] usb_stor_control_thread+0x173/0x280 [usb_storage]
: [] ? fill_inquiry_response+0x20/0x20 [usb_storage]
: [] kthread+0xb7/0xc0
: [] kernel_thread_helper+0x4/0x10
: [] ? retint_restore_args+0x13/0x13
: [] ? kthread_worker_fn+0x1a0/0x1a0
: [] ? gs_change+0x13/0x13

Reported-By: Dave Jones 
Signed-off-by: Ming Lei 
Acked-by: Alan Stern 
Signed-off-by: Greg Kroah-Hartman

Documentation: remove references to /etc/modprobe.conf

2012-03-30T23:03:15+00:00

Usage of /etc/modprobe.conf file was deprecated by module-init-tools and
is no longer parsed by new kmod tool. References to this file are
replaced in Documentation, comments and Kconfig according to the
context.

There are also some references to the old /etc/modules.conf from 2.4
kernels that are being removed.

Signed-off-by: Lucas De Marchi 
Acked-by: Takashi Iwai 
Acked-by: Mauro Carvalho Chehab 
Signed-off-by: Randy Dunlap 
Signed-off-by: Linus Torvalds

usb/storage: redefine US_BULK_FLAG_IN and use it

2012-02-28T19:07:42+00:00

US_BULK_FLAG_IN is defined as 1 and not used. The USB storage spec says
that bit 7 of flags within CBW defines the data direction. 1 is DATA-IN
(read from device) and 0 is the DATA-OUT. Bit 6 is obselete and bits 0-5
are reserved.
This patch redefines the unsued define US_BULK_FLAG_IN from 1 to 1 << 7
aka 0x80 and replaces the obvious users. In a following patch the
storage gadget will use it as well.

Signed-off-by: Sebastian Andrzej Siewior 
Signed-off-by: Greg Kroah-Hartman

usb/storage: a couple defines from drivers/usb/storage/transport.h to include/linux/usb/storage.h

2012-02-28T19:05:18+00:00

This moves the BOT data structures for CBW and CSW from drivers internal
header file to global include able file in include/.
The storage gadget is using the same name for CSW but a different for
CBW so I fix it up properly. The same goes for the ub driver and keucr
driver in staging.

Signed-off-by: Sebastian Andrzej Siewior 
Signed-off-by: Greg Kroah-Hartman

USB: ums_realtek: do not use stack memory for DMA in __do_config_autodelink

2012-02-24T21:37:45+00:00

__do_config_autodelink passes the data variable to the transport function.
If the calling functions pass a stack variable, this will eventually trigger
a DMA-API debug backtrace for mapping stack memory in the DMA buffer.  Fix
this by calling kmemdup for the passed data instead.

Signed-off-by: Josh Boyer 
Cc: stable 
Signed-off-by: Greg Kroah-Hartman

Merge branch 'usb-3.3-rc4' into usb-next

2012-02-23T16:21:03+00:00

This is to pull in the xhci changes and the other fixes and device id
updates that were done in Linus's tree.

Signed-off-by: Greg Kroah-Hartman

usb-storage: fix freezing of the scanning thread

2012-02-22T00:29:15+00:00

This patch (as1521b) fixes the interaction between usb-storage's
scanning thread and the freezer.  The current implementation has a
race: If the device is unplugged shortly after being plugged in and
just as a system sleep begins, the scanning thread may get frozen
before the khubd task.  Khubd won't be able to freeze until the
disconnect processing is complete, and the disconnect processing can't
proceed until the scanning thread finishes, so the sleep transition
will fail.

The implementation in the 3.2 kernel suffers from an additional
problem.  There the scanning thread calls set_freezable_with_signal(),
and the signals sent by the freezer will mess up the thread's I/O
delays, which are all interruptible.

The solution to both problems is the same: Replace the kernel thread
used for scanning with a delayed-work routine on the system freezable
work queue.  Freezable work queues have the nice property that you can
cancel a work item even while the work queue is frozen, and no signals
are needed.

The 3.2 version of this patch solves the problem in Bugzilla #42730.

Signed-off-by: Alan Stern 
Acked-by: Seth Forshee 
CC: stable 
Signed-off-by: Greg Kroah-Hartman

Merge tag 'usb-3.3-rc3' into usb-next

2012-02-10T19:13:53+00:00

This is done to resolve a merge conflict with:
	drivers/usb/class/cdc-wdm.c
and to better handle future patches for this driver as it is under
active development at the moment.

Signed-off-by: Greg Kroah-Hartman

usb-storage: reorganize target-specific code

2012-02-09T01:36:41+00:00

Now that usb-storage has a target_alloc() routine, this patch (as1508)
moves some existing target-specific code out of the slave_alloc()
routine to where it really belongs.

Signed-off-by: Alan Stern 
CC: Matthew Dharm 
Cc: James Bottomley 
Signed-off-by: Greg Kroah-Hartman

SCSI & usb-storage: add flags for VPD pages and REPORT LUNS

2012-02-09T01:36:41+00:00

This patch (as1507) adds a skip_vpd_pages flag to struct scsi_device
and a no_report_luns flag to struct scsi_target.  The first is used to
control whether sd will look at VPD pages for information on block
provisioning, limits, and characteristics.  The second prevents
scsi_report_lun_scan() from issuing a REPORT LUNS command.

The patch also modifies usb-storage to set the new flag bits for all
USB devices and targets, and to stop adjusting the scsi_level value.

Historically we have seen that USB mass-storage devices often don't
support VPD pages or REPORT LUNS properly.  Until now we have avoided
these things by setting the scsi_level to SCSI_2 for all USB devices.
But this has the side effect of storing the LUN bits into the second
byte of each CDB, and now we have a report of a device which doesn't
like that.  The best solution is to stop abusing scsi_level and
instead have separate flags for VPD pages and REPORT LUNS.

Signed-off-by: Alan Stern 
Reported-by: Perry Wagle 
CC: Matthew Dharm 
Cc: James Bottomley 
Signed-off-by: Greg Kroah-Hartman