linux-stable.git/drivers/scsi/fcoe, branch v3.5

[SCSI] fcoe, bnx2fc, libfcoe: SW FCoE and bnx2fc use FCoE Syfs

2012-05-23T08:43:13+00:00

This patch has the SW FCoE driver and the bnx2fc
driver make use of the new fcoe_sysfs API added
earlier in this patch series.

After this patch a fcoe_ctlr_device is allocated with
private data in this order.

+------------------+   +------------------+
| fcoe_ctlr_device |   | fcoe_ctlr_device |
+------------------+   +------------------+
| fcoe_ctlr        |   | fcoe_ctlr        |
+------------------+   +------------------+
| fcoe_interface   |   | bnx2fc_interface |
+------------------+   +------------------+

libfcoe also takes part in this new model since it
discovers and manages fcoe_fcf instances. The memory
allocation is different for FCFs. I didn't want to
impact libfcoe's fcoe_fcf processing, so this patch
creates fcoe_fcf_device instances for each discovered
fcoe_fcf. The two are paired using a (void * priv)
member of the fcoe_ctlr_device. This allows libfcoe
to continue maintaining its list of fcoe_fcf instances
and simply attaches and detaches them from existing
or new fcoe_fcf_device instances.

Signed-off-by: Robert Love 
Tested-by: Ross Brattain 
Signed-off-by: James Bottomley

[SCSI] libfcoe: Add fcoe_sysfs

2012-05-23T08:40:09+00:00

This patch adds a 'fcoe bus' infrastructure to the kernel
that is driven by changes to libfcoe which allow LLDs to
present FIP (FCoE Initialization Protocol) discovered
entities and their attributes to user space via sysfs.

This patch adds the following APIs-

fcoe_ctlr_device_add
fcoe_ctlr_device_delete
fcoe_fcf_device_add
fcoe_fcf_device_delete

They allow the LLD to expose the FCoE ENode Controller
and any discovered FCFs (Fibre Channel Forwarders, e.g.
FCoE switches) to the user. Each of these new devices
has their own bus_type so that they are grouped together
for easy lookup from a user space application. Each
new class has an attribute_group to expose attributes
for any created instances. The attributes are-

fcoe_ctlr_device
* fcf_dev_loss_tmo
* lesb_link_fail
* lesb_vlink_fail
* lesb_miss_fka
* lesb_symb_err
* lesb_err_block
* lesb_fcs_error

fcoe_fcf_device
* fabric_name
* switch_name
* priority
* selected
* fc_map
* vfid
* mac
* fka_peroid
* fabric_state
* dev_loss_tmo

A device loss infrastructre similar to the FC Transport's
is also added by this patch. It is nice to have so that a
link flapping adapter doesn't continually advance the count
used to identify the discovered FCF. FCFs will exist in a
"Disconnected" state until either the timer expires or the
FCF is rediscovered and becomes "Connected."

This patch generates a few checkpatch.pl WARNINGS that
I'm not sure what to do about. They're macros modeled
around the FC Transport attribute building macros, which
have the same 'feature' where the caller can ommit a cast
in the argument list and no cast occurs in the code. I'm
not sure how to keep the code condensed while keeping the
macros. Any advice would be appreciated.

Signed-off-by: Robert Love 
Tested-by: Ross Brattain 
Acked-by: Greg Kroah-Hartman 
Signed-off-by: James Bottomley

[SCSI] fcoe: Allocate fcoe_ctlr with fcoe_interface, not as a member

2012-05-23T08:36:27+00:00

Currently the fcoe_ctlr associated with an interface is allocated
as a member of struct fcoe_interface. This causes problems when
attempting to use the new fcoe_sysfs APIs which allow us to allocate
the fcoe_interface as private data to the fcoe_ctlr_device instance.
The problem is that libfcoe wants to be able use pointer math to find a
fcoe_ctlr's fcoe_ctlr_device as well as finding a fcoe_ctlr_device's
assocated fcoe_ctlr. To do this we need to allocate the
fcoe_ctlr_device, with private data for the LLD. The private data
contains the fcoe_ctlr and its private data is the fcoe_interface.
This patch only allocates the fcoe_interface with the fcoe_ctlr, the
fcoe_ctlr_device will be added in a later patch, which will complete
the below diagram-

+------------------+
| fcoe_ctlr_device |
+------------------+
| fcoe_ctlr        |
+------------------+
| fcoe_interface   |
+------------------+

This prep work will allow us to go from a fcoe_ctlr_device instance
to its fcoe_ctlr as well as from a fcoe_ctlr to its fcoe_ctlr_device
once the fcoe_sysfs API is in use (later patches in this series).

Signed-off-by: Robert Love 
Tested-by: Ross Brattain 
Signed-off-by: James Bottomley

[SCSI] fcoe: remove a stray unlock

2012-05-10T07:59:26+00:00

We moved the locking in dd060e74fb "[SCSI] fcoe: remove frame dropping
code from fcoe_percpu_clean" but this unlock was missed.

Signed-off-by: Dan Carpenter 
Signed-off-by: Robert Love 
Signed-off-by: James Bottomley

[SCSI] libfcoe: fix VN2VN N_Port_ID Beacon source MAC

2012-05-10T07:59:26+00:00

FC-BB-6 v1.04 7.9.8.14 N_Port_ID Beacon:

"A N_Port_ID Beacon is multicast and uses the VN_Port MAC address as source
address."

Currently, libfcoe is using ENode MAC, this seems ok and functionality wise
not a problem in my back to back testing setup, however, just fix this to
make libfcoe VN2VN support more spec compliant.

Signed-off-by: Yi Zou 
Signed-off-by: Robert Love 
Signed-off-by: James Bottomley

[SCSI] fcoe: Don't hold rtnl_mutex in fcoe_update_src_mac

2012-05-10T07:59:25+00:00

The rtnl_mutex was held to protect calls to dev_uc_add
and dev_uc_del. Holding rtnl is not required as those
functions make use of the netif_addr_lock* API to
protect the MAC changing.

This change fixes the following regression by removing
the rtnl usage when fcoe_update_src_mac is called.

https://bugzilla.kernel.org/show_bug.cgi?id=42918

the existing dependency chain (in reverse order) is:

-> #1 (&fip->ctlr_mutex){+.+...}:
       [] lock_acquire+0x80/0x1b0
       [] mutex_lock_nested+0x6d/0x340
       [] fcoe_ctlr_link_up+0x22/0x180 [libfcoe]
       [] fcoe_create+0x47e/0x6e0 [fcoe]
       [] fcoe_transport_create+0x143/0x250 [libfcoe]
       [] param_attr_store+0x30/0x60
       [] module_attr_store+0x26/0x40
       [] sysfs_write_file+0xae/0x100
       [] vfs_write+0x8f/0x160
       [] sys_write+0x3d/0x70
       [] syscall_call+0x7/0xb

-> #0 (rtnl_mutex){+.+.+.}:
       [] __lock_acquire+0x140b/0x1720
       [] lock_acquire+0x80/0x1b0
       [] mutex_lock_nested+0x6d/0x340
       [] rtnl_lock+0x14/0x20
       [] fcoe_update_src_mac+0x2c/0xb0 [fcoe]
       [] fcoe_ctlr_timer_work+0x712/0xb60 [libfcoe]
       [] process_one_work+0x179/0x5d0
       [] worker_thread+0x121/0x2d0
       [] kthread+0x7d/0x90
       [] kernel_thread_helper+0x6/0x10

other info that might help us debug this:

 Possible unsafe locking scenario:

       CPU0                    CPU1
       ----                    ----
  lock(&fip->ctlr_mutex);
                               lock(rtnl_mutex);
                               lock(&fip->ctlr_mutex);
  lock(rtnl_mutex);

 *** DEADLOCK ***

Signed-off-by: Robert Love 
Tested-by: Bart Van Assche 
Signed-off-by: James Bottomley

[SCSI] libfc: defer releasing master lport until complete fcoe interface cleanuped up

2012-05-10T07:59:25+00:00

The fcoe controller has back references, therefore defer
releasing master lport which gets freed along scsi_host_put
and then free it once fcoe interface is fully cleaned.

Signed-off-by: Vasu Dev 
Acked-by: Neil Horman 
Tested-by: Ross Brattain 
Signed-off-by: Robert Love 
Signed-off-by: James Bottomley

[SCSI] fcoe: remove lport from net device before doing per cpu rx thread cleanup

2012-05-10T07:59:24+00:00

Remove lport from net device and then do synchronize net device to flush
inflight rx frames for the lport before doing fcoe_percpu_clean.

In case of master lport, remove all rx packet handlers completely and
then only do fcoe_percpu_clean. This required splitting fcoe_interface_cleanup
to do remove part separately and for that added func fcoe_interface_remove
and then  call it from fcoe_if_destory before doing fcoe_percpu_clean.
However if fcoe_interface_remove() is already called then
don't call again from fcoe_interface_cleanup() to preserve its
existing flows.

This patch along with Neil's other patch to avoid soft irq context
on ingress will avoid passing up frames on disabled lport as
discussed in this mail thread:-
http://lists.open-fcoe.org/pipermail/devel/2012-February/011947.html

Signed-off-by: Vasu Dev 
Acked-by: Neil Horman 
Tested-by: Ross Brattain 
Signed-off-by: Robert Love 
Signed-off-by: James Bottomley

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

2012-03-31T20:31:23+00:00

Pull SCSI updates from James Bottomley:
 "This is primarily another round of driver updates (lpfc, bfa, fcoe,
  ipr) plus a new ufshcd driver.  There shouldn't be anything
  controversial in here (The final deletion of scsi proc_ops which
  caused some build breakage has been held over until the next merge
  window to give us more time to stabilise it).

  I'm afraid, with me moving continents at exactly the wrong time,
  anything submitted after the merge window opened has been held over to
  the next merge window."

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (63 commits)
  [SCSI] ipr: Driver version 2.5.3
  [SCSI] ipr: Increase alignment boundary of command blocks
  [SCSI] ipr: Increase max concurrent oustanding commands
  [SCSI] ipr: Remove unnecessary memory barriers
  [SCSI] ipr: Remove unnecessary interrupt clearing on new adapters
  [SCSI] ipr: Fix target id allocation re-use problem
  [SCSI] atp870u, mpt2sas, qla4xxx use pci_dev->revision
  [SCSI] fcoe: Drop the rtnl_mutex before calling fcoe_ctlr_link_up
  [SCSI] bfa: Update the driver version to 3.0.23.0
  [SCSI] bfa: BSG and User interface fixes.
  [SCSI] bfa: Fix to avoid vport delete hang on request queue full scenario.
  [SCSI] bfa: Move service parameter programming logic into firmware.
  [SCSI] bfa: Revised Fabric Assigned Address(FAA) feature implementation.
  [SCSI] bfa: Flash controller IOC pll init fixes.
  [SCSI] bfa: Serialize the IOC hw semaphore unlock logic.
  [SCSI] bfa: Modify ISR to process pending completions
  [SCSI] bfa: Add fc host issue lip support
  [SCSI] mpt2sas: remove extraneous sas_log_info messages
  [SCSI] libfc: fcoe_transport_create fails in single-CPU environment
  [SCSI] fcoe: reduce contention for fcoe_rx_list lock [v2]
  ...

[SCSI] fcoe: Drop the rtnl_mutex before calling fcoe_ctlr_link_up

2012-03-28T09:06:34+00:00

The rtnl_lock is primarily used to serialize networking
driver changes as well as to ensure that a networking driver
is not removed when making changes to it. fcoe also uses
the rtnl_lock to protect the fcoe hostlist.

fcoe_create holds the rtnl_lock over the entirity of the
routine including a the call to fcoe_ctlr_link_up.
This causes the below deadlock because fcoe_ctlr_link_up
acquires the fcoe_ctlr ctlr_mutex and this deadlocks with
a libfcoe thread that acquires the fcoe_ctlr ctlr_mutex and
then the rtnl_lock (to update a MAC address).

This patch drops the rtnl_lock before calling
fcoe_ctlr_link_up and therefore the deadlock is prevented.

https://bugzilla.kernel.org/show_bug.cgi?id=42918

the existing dependency chain (in reverse order) is:

-> #1 (&fip->ctlr_mutex){+.+...}:
       [] lock_acquire+0x80/0x1b0
       [] mutex_lock_nested+0x6d/0x340
       [] fcoe_ctlr_link_up+0x22/0x180 [libfcoe]
       [] fcoe_create+0x47e/0x6e0 [fcoe]
       [] fcoe_transport_create+0x143/0x250 [libfcoe]
       [] param_attr_store+0x30/0x60
       [] module_attr_store+0x26/0x40
       [] sysfs_write_file+0xae/0x100
       [] vfs_write+0x8f/0x160
       [] sys_write+0x3d/0x70
       [] syscall_call+0x7/0xb

-> #0 (rtnl_mutex){+.+.+.}:
       [] __lock_acquire+0x140b/0x1720
       [] lock_acquire+0x80/0x1b0
       [] mutex_lock_nested+0x6d/0x340
       [] rtnl_lock+0x14/0x20
       [] fcoe_update_src_mac+0x2c/0xb0 [fcoe]
       [] fcoe_ctlr_timer_work+0x712/0xb60 [libfcoe]
       [] process_one_work+0x179/0x5d0
       [] worker_thread+0x121/0x2d0
       [] kthread+0x7d/0x90
       [] kernel_thread_helper+0x6/0x10

other info that might help us debug this:

 Possible unsafe locking scenario:

       CPU0                    CPU1
       ----                    ----
  lock(&fip->ctlr_mutex);
                               lock(rtnl_mutex);
                               lock(&fip->ctlr_mutex);
  lock(rtnl_mutex);

 *** DEADLOCK ***

Signed-off-by: Robert Love 
Signed-off-by: James Bottomley