linux.git/drivers/scsi, branch v3.9-rc6

libfcoe: Fix fcoe_sysfs VN2VN mode

2013-03-25T23:04:22+00:00

The libfc discovery layer is being initialized in the
'create' paths for both legacy libfcoe module parameters
and fcoe_sysfs control interfaces. The problem is that
for VN2VN mode the discovery layer is initialized as if
it were in 'fabric' mode and it is not re-configured when
the mode is changed to 'vn2vn'.

This patch splits out code that needs to be initialized
once and code that can, and should be, re-configured when
the mode changes. Additionally this patch makes that change
so that the discovery layer can be reconfigured to the
libfcoe implementation when in 'vn2vn' mode.

Signed-off-by: Robert Love 
Tested-by: Jack Morgan 
Reviewed-by: Bhanu Prakash Gollapudi

libfc, fcoe, bnx2fc: Split fc_disc_init into fc_disc_{init, config}

2013-03-25T23:03:03+00:00

Split discovery initialization in code that is setup once (fcoe_disc_init)
and code that can be re-configured (fcoe_disc_config).

Signed-off-by: Robert Love 
Tested-by: Jack Morgan 
Reviewed-by: Bhanu Prakash Gollapudi

libfc, fcoe, bnx2fc: Always use fcoe_disc_init for discovery layer initialization

2013-03-25T23:01:10+00:00

Currently libfcoe is doing some libfc discovery layer initialization outside of
libfc. This patch moves this code into libfc and sets up a split in discovery
(one time) initialization code and (re-configurable) settings that will come in
the next patch.

Signed-off-by: Robert Love 
Tested-by: Jack Morgan 
Reviewed-by: Bhanu Prakash Gollapudi

fcoe: Fix deadlock between create and destroy paths

2013-03-25T22:55:56+00:00

We can deadlock (s_active and fcoe_config_mutex) if a
port is being destroyed at the same time one is being created.

[ 4200.503113] ======================================================
[ 4200.503114] [ INFO: possible circular locking dependency detected ]
[ 4200.503116] 3.8.0-rc5+ #8 Not tainted
[ 4200.503117] -------------------------------------------------------
[ 4200.503118] kworker/3:2/2492 is trying to acquire lock:
[ 4200.503119]  (s_active#292){++++.+}, at: [] sysfs_addrm_finish+0x3b/0x70
[ 4200.503127]
but task is already holding lock:
[ 4200.503128]  (fcoe_config_mutex){+.+.+.}, at: [] fcoe_destroy_work+0xe8/0x120 [fcoe]
[ 4200.503133]
which lock already depends on the new lock.

[ 4200.503135]
the existing dependency chain (in reverse order) is:
[ 4200.503136]
-> #1 (fcoe_config_mutex){+.+.+.}:
[ 4200.503139]        [] lock_acquire+0xa1/0x140
[ 4200.503143]        [] mutex_lock_nested+0x6e/0x360
[ 4200.503146]        [] fcoe_enable+0x1d/0xb0 [fcoe]
[ 4200.503148]        [] fcoe_ctlr_enabled+0x2d/0x50 [fcoe]
[ 4200.503151]        [] store_ctlr_enabled+0x38/0x90 [libfcoe]
[ 4200.503154]        [] dev_attr_store+0x18/0x30
[ 4200.503157]        [] sysfs_write_file+0xe0/0x150
[ 4200.503160]        [] vfs_write+0xac/0x180
[ 4200.503162]        [] sys_write+0x52/0xa0
[ 4200.503164]        [] system_call_fastpath+0x16/0x1b
[ 4200.503167]
-> #0 (s_active#292){++++.+}:
[ 4200.503170]        [] __lock_acquire+0x135f/0x1c90
[ 4200.503172]        [] lock_acquire+0xa1/0x140
[ 4200.503174]        [] sysfs_deactivate+0x116/0x160
[ 4200.503176]        [] sysfs_addrm_finish+0x3b/0x70
[ 4200.503178]        [] sysfs_hash_and_remove+0x5b/0xb0
[ 4200.503180]        [] sysfs_remove_group+0x61/0x100
[ 4200.503183]        [] device_remove_groups+0x3b/0x60
[ 4200.503185]        [] device_remove_attrs+0x44/0x80
[ 4200.503187]        [] device_del+0x127/0x1c0
[ 4200.503189]        [] device_unregister+0x22/0x60
[ 4200.503191]        [] fcoe_ctlr_device_delete+0xe0/0xf0 [libfcoe]
[ 4200.503194]        [] fcoe_interface_cleanup+0x6c/0xa0 [fcoe]
[ 4200.503196]        [] fcoe_destroy_work+0x105/0x120 [fcoe]
[ 4200.503198]        [] process_one_work+0x1a1/0x580
[ 4200.503203]        [] worker_thread+0x15e/0x440
[ 4200.503205]        [] kthread+0xea/0xf0
[ 4200.503207]        [] ret_from_fork+0x7c/0xb0

[ 4200.503209]
other info that might help us debug this:

[ 4200.503211]  Possible unsafe locking scenario:

[ 4200.503212]        CPU0                    CPU1
[ 4200.503213]        ----                    ----
[ 4200.503214]   lock(fcoe_config_mutex);
[ 4200.503215]                                lock(s_active#292);
[ 4200.503218]                                lock(fcoe_config_mutex);
[ 4200.503219]   lock(s_active#292);
[ 4200.503221]
 *** DEADLOCK ***

[ 4200.503223] 3 locks held by kworker/3:2/2492:
[ 4200.503224]  #0:  (fcoe){.+.+.+}, at: [] process_one_work+0x13b/0x580
[ 4200.503228]  #1:  ((&port->destroy_work)){+.+.+.}, at: [] process_one_work+0x13b/0x580
[ 4200.503232]  #2:  (fcoe_config_mutex){+.+.+.}, at: [] fcoe_destroy_work+0xe8/0x120 [fcoe]
[ 4200.503236]
stack backtrace:
[ 4200.503238] Pid: 2492, comm: kworker/3:2 Not tainted 3.8.0-rc5+ #8
[ 4200.503240] Call Trace:
[ 4200.503243]  [] print_circular_bug+0x1fb/0x20c
[ 4200.503246]  [] __lock_acquire+0x135f/0x1c90
[ 4200.503248]  [] ? debug_check_no_locks_freed+0x9a/0x180
[ 4200.503250]  [] lock_acquire+0xa1/0x140
[ 4200.503253]  [] ? sysfs_addrm_finish+0x3b/0x70
[ 4200.503255]  [] sysfs_deactivate+0x116/0x160
[ 4200.503258]  [] ? sysfs_addrm_finish+0x3b/0x70
[ 4200.503260]  [] sysfs_addrm_finish+0x3b/0x70
[ 4200.503262]  [] sysfs_hash_and_remove+0x5b/0xb0
[ 4200.503265]  [] sysfs_remove_group+0x61/0x100
[ 4200.503273]  [] device_remove_groups+0x3b/0x60
[ 4200.503275]  [] device_remove_attrs+0x44/0x80
[ 4200.503277]  [] device_del+0x127/0x1c0
[ 4200.503279]  [] device_unregister+0x22/0x60
[ 4200.503282]  [] fcoe_ctlr_device_delete+0xe0/0xf0 [libfcoe]
[ 4200.503285]  [] fcoe_interface_cleanup+0x6c/0xa0 [fcoe]
[ 4200.503287]  [] fcoe_destroy_work+0x105/0x120 [fcoe]
[ 4200.503290]  [] process_one_work+0x1a1/0x580
[ 4200.503292]  [] ? process_one_work+0x13b/0x580
[ 4200.503295]  [] ? fcoe_if_destroy+0x230/0x230 [fcoe]
[ 4200.503297]  [] worker_thread+0x15e/0x440
[ 4200.503299]  [] ? busy_worker_rebind_fn+0x100/0x100
[ 4200.503301]  [] kthread+0xea/0xf0
[ 4200.503304]  [] ? kthread_create_on_node+0x160/0x160
[ 4200.503306]  [] ret_from_fork+0x7c/0xb0
[ 4200.503308]  [] ? kthread_create_on_node+0x160/0x160

Signed-off-by: Robert Love 
Tested-by: Jack Morgan

bnx2fc: Make the fcoe_cltr the SCSI host parent

2013-03-25T19:19:15+00:00

The fcoemon userspace daemon is searching for the a hostX
under the the /sys/bus/fcoe/devices/ctlrX/ entries. When
interfaces created using fcoe_sysfs and fcoe.ko this linkage
is setup correctly, but bnx2fc is not doing the same thing
and therefore fcoemon does not create the fcoe interface
for bnx2fc.

This patch sets up the correct linkage for bnx2fc such that
fcoemon will work correctly with fcoe_sysfs and bnx2fc.

Signed-off-by: Robert Love 
Acked-by: Bhanu Prakash Gollapudi

ACPI / glue: Add .match() callback to struct acpi_bus_type

2013-03-04T13:23:40+00:00

USB uses the .find_bridge() callback from struct acpi_bus_type
incorrectly, because as a result of the way it is used by USB every
device in the system that doesn't have a bus type or parent is
passed to usb_acpi_find_device() for inspection.

What USB actually needs, though, is to call usb_acpi_find_device()
for USB ports that don't have a bus type defined, but have
usb_port_device_type as their device type, as well as for USB
devices.

To fix that replace the struct bus_type pointer in struct
acpi_bus_type used for matching devices to specific subsystems
with a .match() callback to be used for this purpose and update
the users of struct acpi_bus_type, including USB, accordingly.
Define the .match() callback routine for USB, usb_acpi_bus_match(),
in such a way that it will cover both USB devices and USB ports
and remove the now redundant .find_bridge() callback pointer from
usb_acpi_bus.

Signed-off-by: Rafael J. Wysocki 
Acked-by: Greg Kroah-Hartman 
Acked-by: Yinghai Lu 
Acked-by: Jeff Garzik

Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2013-03-02T19:42:16+00:00

Pull SCSI updates from James Bottomley:
 "This is an assorted set of stragglers into the merge window with
  driver updates for qla2xxx, megaraid_sas, storvsc and ufs.

  It also includes pulls of the uapi tree (all the remaining SCSI
  pieces) and the fcoe tree (updates to fcoe and libfc)"

* tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (81 commits)
  [SCSI] ufs: Separate PCI code into glue driver
  [SCSI] ufs: Segregate PCI Specific Code
  [SCSI] scsi: fix lpfc build when wmb() is defined as mb()
  [SCSI] storvsc: Handle dynamic resizing of the device
  [SCSI] storvsc: Restructure error handling code on command completion
  [SCSI] storvsc: avoid usage of WRITE_SAME
  [SCSI] aacraid: suppress two GCC warnings
  [SCSI] hpsa: check for dma_mapping_error in hpsa_passthru ioctls
  [SCSI] hpsa: reorganize error handling in hpsa_passthru_ioctl
  [SCSI] hpsa: check for dma_mapping_error in hpsa_map_sg_chain_block
  [SCSI] hpsa: Check for dma_mapping_error for all code paths using fill_cmd
  [SCSI] hpsa: Check for dma_mapping_error in hpsa_map_one
  [SCSI] dc395x: uninitialized variable in device_alloc()
  [SCSI] Fix range check in scsi_host_dif_capable()
  [SCSI] storvsc: Initialize the sglist
  [SCSI] mpt2sas: Add support for OEM specific controller
  [SCSI] ipr: Fix oops while resetting an ipr adapter
  [SCSI] fnic: Fnic Trace Utility
  [SCSI] fnic: New debug flags and debug log messages
  [SCSI] fnic: fnic driver may hit BUG_ON on device reset
  ...

[SCSI] Merge tag 'fcoe-02-19-13' into for-linus

2013-03-01T09:10:08+00:00

FCoE Updates for 3.9

Signed-off-by: James Bottomley

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2013-02-28T20:43:43+00:00

Pull first round of SCSI updates from James Bottomley:
 "The patch set is mostly driver updates (bnx2fc, ipr, lpfc, qla4) and a
  few bug fixes"

Pull delayed because google hates James, and sneakily considers his pull
requests spam. Why, google, why?

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (60 commits)
  [SCSI] aacraid: 1024 max outstanding command support for Series 7 and above
  [SCSI] bnx2fc: adjust duplicate test
  [SCSI] qla4xxx: Update driver version to 5.03.00-k4
  [SCSI] qla4xxx: Fix return code for qla4xxx_session_get_param.
  [SCSI] qla4xxx: wait for boot target login response during probe.
  [SCSI] qla4xxx: Added support for force firmware dump
  [SCSI] qla4xxx: Re-register IRQ handler while retrying initialize of adapter
  [SCSI] qla4xxx: Throttle active IOCBs to firmware limits
  [SCSI] qla4xxx: Remove unnecessary code from qla4xxx_init_local_data
  [SCSI] qla4xxx: Quiesce driver activities while loopback
  [SCSI] qla4xxx: Rename MBOX_ASTS_IDC_NOTIFY to MBOX_ASTS_IDC_REQUEST_NOTIFICATION
  [SCSI] qla4xxx: Add spurious interrupt messages under debug level 2
  [SCSI] cxgb4i: Remove the scsi host device when removing device
  [SCSI] bfa: fix strncpy() limiter in bfad_start_ops()
  [SCSI] qla4xxx: Update driver version to 5.03.00-k3
  [SCSI] qla4xxx: Correct the validation to check in get_sys_info mailbox
  [SCSI] qla4xxx: Pass correct function param to qla4_8xxx_rd_direct
  [SCSI] lpfc 8.3.37: Update lpfc version for 8.3.37 driver release
  [SCSI] lpfc 8.3.37: Fixed infinite loop in lpfc_sli4_fcf_rr_next_index_get.
  [SCSI] lpfc 8.3.37: Fixed crash due to SLI Port invalid resource count
  ...

scsi/lpfc: convert to idr_alloc()

2013-02-28T03:10:19+00:00

Convert to the much saner new idr interface.

Signed-off-by: Tejun Heo 
Acked-by: James Smart 
Cc: James Bottomley 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds