[SCSI] libfc, libfcoe, fcoe: use smp_processor_id() only when preempt disabled

When the kernel is configured for preemption, using smp_processor_id()
when preemption is enabled causes a warning backtrace and is wrong
since we could move off of that CPU as soon as we get the ID,
and we would be referencing the wrong CPU, and possibly an invalid one
if it could be hotswapped out.

Remove the fc_lport_get_stats() function and explicitly use per_cpu_ptr()
to get the statistics.  Where preemption has been disabled by holding
a _bh lock continue to use smp_processor_id(), but otherwise use
get_cpu()/put_cpu().

In fcoe_recv_frame() also changed the cases where we return in the
middle to do a goto to the code which bumps ErrorFrames and does
a put_cpu().  Two of these cases didn't bump ErrorFrames before, but
doing so is harmless because they "can't happen", due to prior length
checks.

Also rearranged code in fcoe_recv_frame() to have only one call to
fc_exch_recv().  It's just as efficient and saves a call to put_cpu().

In fc_fcp.c, adjusted a FIXME comment for code which doesn't need fixing.

Signed-off-by: Joe Eykholt <jeykholt@cisco.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1 files changed, 13 insertions, 6 deletions

diff --git a/drivers/scsi/fcoe/libfcoe.c b/drivers/scsi/fcoe/libfcoe.c
index b7718be3c096..ff5ccba3d741 100644
--- a/drivers/scsi/fcoe/libfcoe.c
+++ b/drivers/scsi/fcoe/libfcoe.c
@@ -550,7 +550,7 @@ EXPORT_SYMBOL(fcoe_ctlr_els_send);
  * fcoe_ctlr_age_fcfs() - Reset and free all old FCFs for a controller
  * @fip: The FCoE controller to free FCFs on
  *
- * Called with lock held.
+ * Called with lock held and preemption disabled.
  *
  * An FCF is considered old if we have missed three advertisements.
  * That is, there have been no valid advertisement from it for three
@@ -567,17 +567,20 @@ static void fcoe_ctlr_age_fcfs(struct fcoe_ctlr *fip)
         struct fcoe_fcf *next;
         unsigned long sel_time = 0;
         unsigned long mda_time = 0;
+        struct fcoe_dev_stats *stats;
 
         list_for_each_entry_safe(fcf, next, &fip->fcfs, list) {
                 mda_time = fcf->fka_period + (fcf->fka_period >> 1);
                 if ((fip->sel_fcf == fcf) &&
                     (time_after(jiffies, fcf->time + mda_time))) {
                         mod_timer(&fip->timer, jiffies + mda_time);
-                        fc_lport_get_stats(fip->lp)->MissDiscAdvCount++;
+                        stats = per_cpu_ptr(fip->lp->dev_stats,
+                                            smp_processor_id());
+                        stats->MissDiscAdvCount++;
                         printk(KERN_INFO "libfcoe: host%d: Missing Discovery "
                                "Advertisement for fab %llx count %lld\n",
                                fip->lp->host->host_no, fcf->fabric_name,
-                               fc_lport_get_stats(fip->lp)->MissDiscAdvCount);
+                               stats->MissDiscAdvCount);
                 }
                 if (time_after(jiffies, fcf->time + fcf->fka_period * 3 +
                                msecs_to_jiffies(FIP_FCF_FUZZ * 3))) {
@@ -587,7 +590,9 @@ static void fcoe_ctlr_age_fcfs(struct fcoe_ctlr *fip)
                         WARN_ON(!fip->fcf_count);
                         fip->fcf_count--;
                         kfree(fcf);
-                        fc_lport_get_stats(fip->lp)->VLinkFailureCount++;
+                        stats = per_cpu_ptr(fip->lp->dev_stats,
+                                            smp_processor_id());
+                        stats->VLinkFailureCount++;
                 } else if (fcoe_ctlr_mtu_valid(fcf) &&
                            (!sel_time || time_before(sel_time, fcf->time))) {
                         sel_time = fcf->time;
@@ -900,9 +905,10 @@ static void fcoe_ctlr_recv_els(struct fcoe_ctlr *fip, struct sk_buff *skb)
         fr_eof(fp) = FC_EOF_T;
         fr_dev(fp) = lport;
 
-        stats = fc_lport_get_stats(lport);
+        stats = per_cpu_ptr(lport->dev_stats, get_cpu());
         stats->RxFrames++;
         stats->RxWords += skb->len / FIP_BPW;
+        put_cpu();
 
         fc_exch_recv(lport, fp);
         return;
@@ -1000,7 +1006,8 @@ static void fcoe_ctlr_recv_clr_vlink(struct fcoe_ctlr *fip,
                 LIBFCOE_FIP_DBG(fip, "performing Clear Virtual Link\n");
 
                 spin_lock_bh(&fip->lock);
-                fc_lport_get_stats(lport)->VLinkFailureCount++;
+                per_cpu_ptr(lport->dev_stats,
+                            smp_processor_id())->VLinkFailureCount++;
                 fcoe_ctlr_reset(fip);
                 spin_unlock_bh(&fip->lock);