1. 18 May, 2018 28 commits
    • Steffen Maier's avatar
      scsi: zfcp: split FCP_CMND IU setup between SCSI I/O and TMF again · e0116c91
      Steffen Maier authored
      This reverts commit 2443c8b2 ("[SCSI] zfcp: Merge FCP task management
      setup with regular FCP command setup"), because this introduced a
      dependency on the unsuitable SCSI command for scsi_eh / TMF.
      Signed-off-by: default avatarSteffen Maier <maier@linux.ibm.com>
      Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
      Reviewed-by: default avatarBenjamin Block <bblock@linux.ibm.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      e0116c91
    • Steffen Maier's avatar
      scsi: zfcp: decouple TMF response handler from scsi_cmnd · 266883f2
      Steffen Maier authored
      Originally, I planned for TMF handling to have different context data in
      fsf_req->data depending on the TMF scope in fcp_cmnd->fc_tm_flags:
      
       * scsi_device if FCP_TMF_LUN_RESET,
       * zfcp_port if FCP_TMF_TGT_RESET.
      
      However, the FCP channel requires a valid LUN handle so we now use
      scsi_device as context data with any TMF for the time being.
      
      Regular SCSI I/O FCP requests continue using scsi_cmnd as req->data.
      
      Hence, the callers of zfcp_fsf_fcp_handler_common() must resolve req->data
      and pass scsi_device as common context.  While at it, remove the detour
      zfcp_sdev->port->adapter and use the more direct req->adapter as elsewhere
      in this function already.
      Signed-off-by: default avatarSteffen Maier <maier@linux.ibm.com>
      Reviewed-by: default avatarBenjamin Block <bblock@linux.ibm.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      266883f2
    • Steffen Maier's avatar
      scsi: zfcp: decouple SCSI traces for scsi_eh / TMF from scsi_cmnd · 82212118
      Steffen Maier authored
      The SCSI command pointer passed to scsi_eh callbacks is just one arbitrary
      command of potentially many that are in the eh queue to be processed.  The
      command is only used to indirectly pass the TMF scope in terms of SCSI
      ID/target and SCSI LUN for LUN reset.
      
      Hence, zfcp had filled in SCSI trace record fields which do not really
      belong to the TMF. This was confusing.
      
      Therefore, refactor the TMF tracing to work without SCSI command.  Since the
      FCP channel always requires a valid LUN handle, we use SCSI device as common
      context for any TMF (even target reset).  To make it even clearer, we set
      all bits to 1 for the fields, which do not belong to the TMF, to indicate
      that these fields are invalid.
      
      The old zfcp_dbf_scsi() became zfcp_dbf_scsi_common() to now handle both
      SCSI commands and TMFs. The old argument scsi_cmnd is now optional and can
      be NULL with TMFs. The new argument scsi_device is mandatory to carry
      context, as well as SCSI ID/target and SCSI LUN in case of TMFs.
      
      New example trace record formatted with zfcpdbf from s390-tools:
      
      Timestamp      : ...
      Area           : SCSI
      Subarea        : 00
      Level          : 1
      Exception      : -
      CPU ID         : ..
      Caller         : 0x...
      Record ID      : 1
      Tag            : [lt]r_....
      Request ID     : 0x<reqid>              ID of FSF FCP request with TM flag
                       For cases without FSF request: 0x0 for none (invalid)
      SCSI ID        : 0x<scsi_id>            SCSI ID/target denoting scope
      SCSI LUN       : 0x<scsi_lun>           SCSI LUN denoting scope
      SCSI LUN high  : 0x<scsi_lun_high>      SCSI LUN denoting scope
      SCSI result    : 0xffffffff                             none (invalid)
      SCSI retries   : 0xff                                   none (invalid)
      SCSI allowed   : 0xff                                   none (invalid)
      SCSI scribble  : 0xffffffffffffffff                     none (invalid)
      SCSI opcode    : ffffffff ffffffff ffffffff ffffffff    none (invalid)
      FCP rsp inf cod: 0x00                   FCP_RSP info code of TMF
      FCP rsp IU     : 00000000 00000000 00000100 00000000 ext FCP_RSP IU
                       00000000 00000008                   ext FCP_RSP IU
      FCP rsp IU len : 32                                  FCP_RSP IU length
      Payload time   : ...
      FCP rsp IU all : 00000000 00000000 00000100 00000000 full FCP_RSP IU
                       00000000 00000008 00000000 00000000 full FCP_RSP IU
      Signed-off-by: default avatarSteffen Maier <maier@linux.ibm.com>
      Reviewed-by: default avatarBenjamin Block <bblock@linux.ibm.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      82212118
    • Steffen Maier's avatar
      scsi: zfcp: fix missing REC trigger trace on enqueue without ERP thread · 6a765508
      Steffen Maier authored
      Example trace record formatted with zfcpdbf from s390-tools:
      
      Timestamp      : ...
      Area           : REC
      Subarea        : 00
      Level          : 1
      Exception      : -
      CPU ID         : ..
      Caller         : 0x...
      Record ID      : 1                      ZFCP_DBF_REC_TRIG
      Tag            : .......
      LUN            : 0x...
      WWPN           : 0x...
      D_ID           : 0x...
      Adapter status : 0x...
      Port status    : 0x...
      LUN status     : 0x...
      Ready count    : 0x...
      Running count  : 0x...
      ERP want       : 0x0.                   ZFCP_ERP_ACTION_REOPEN_...
      ERP need       : 0xc0                   ZFCP_ERP_ACTION_NONE
      Signed-off-by: default avatarSteffen Maier <maier@linux.ibm.com>
      Cc: <stable@vger.kernel.org> #2.6.38+
      Reviewed-by: default avatarBenjamin Block <bblock@linux.ibm.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      6a765508
    • Steffen Maier's avatar
      scsi: zfcp: fix missing REC trigger trace for all objects in ERP_FAILED · 8c3d20aa
      Steffen Maier authored
      That other commit introduced an inconsistency because it would trace on
      ERP_FAILED for all callers of port forced reopen triggers (not just
      terminate_rport_io), but it would not trace on ERP_FAILED for all callers of
      other ERP triggers such as adapter, port regular, LUN.
      
      Therefore, generalize that other commit. zfcp_erp_action_enqueue() already
      had two early outs which re-used the one zfcp_dbf_rec_trig() call.  All ERP
      trigger functions finally run through zfcp_erp_action_enqueue().  So move
      the special handling for ZFCP_STATUS_COMMON_ERP_FAILED into
      zfcp_erp_action_enqueue() and add another early out with new trace marker
      for pseudo ERP need in this case. This removes all early returns from all
      ERP trigger functions so we always end up at zfcp_dbf_rec_trig().
      
      Example trace record formatted with zfcpdbf from s390-tools:
      
      Timestamp      : ...
      Area           : REC
      Subarea        : 00
      Level          : 1
      Exception      : -
      CPU ID         : ..
      Caller         : 0x...
      Record ID      : 1                      ZFCP_DBF_REC_TRIG
      Tag            : .......
      LUN            : 0x...
      WWPN           : 0x...
      D_ID           : 0x...
      Adapter status : 0x...
      Port status    : 0x...
      LUN status     : 0x...
      Ready count    : 0x...
      Running count  : 0x...
      ERP want       : 0x0.                   ZFCP_ERP_ACTION_REOPEN_...
      ERP need       : 0xe0                   ZFCP_ERP_ACTION_FAILED
      Signed-off-by: default avatarSteffen Maier <maier@linux.ibm.com>
      Cc: <stable@vger.kernel.org> #2.6.38+
      Reviewed-by: default avatarBenjamin Block <bblock@linux.ibm.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      8c3d20aa
    • Steffen Maier's avatar
      scsi: zfcp: fix missing REC trigger trace on terminate_rport_io for ERP_FAILED · d70aab55
      Steffen Maier authored
      For problem determination we always want to see when we were invoked on the
      terminate_rport_io callback whether we perform something or not.
      
      Temporal event sequence of interest with a long fast_io_fail_tmo of 27 sec:
      
      loose remote port
      
      t   workqueue
      [s] zfcp_q_<dev>       IRQ                 zfcperp<dev>
      
      === ================== =================== ============================
      
        0                    recv RSCN
                             q p.test_link_work
          block rport
           start fast_io_fail_tmo
          send ADISC ELS
        4                    recv ADISC fail
                             block zfcp_port
                                                 port forced reopen
                                                 send open port
       12                    recv open port fail
                                                 q p.gid_pn_work
                                                 zfcp_erp_wakeup
                                                 (zfcp_erp_wait would return)
          GID_PN fail
      
      Before this point, we got a SCSI trace with tag "sctrpi1" on fast_io_fail,
      e.g. with the typical 5 sec setting.
      
          port.status |= ERP_FAILED
      
      If fast_io_fail_tmo triggers after this point, we missed a SCSI trace.
      
          workqueue
          fc_dl_<host>
          ==================
       27 fc_timeout_fail_rport_io
          fc_terminate_rport_io
          zfcp_scsi_terminate_rport_io
          zfcp_erp_port_forced_reopen
          _zfcp_erp_port_forced_reopen
           if (port.status & ERP_FAILED)
            return;
      
      Therefore, write a trace before above early return.
      
      Example trace record formatted with zfcpdbf from s390-tools:
      
      Timestamp      : ...
      Area           : REC
      Subarea        : 00
      Level          : 1
      Exception      : -
      CPU ID         : ..
      Caller         : 0x...
      Record ID      : 1                      ZFCP_DBF_REC_TRIG
      Tag            : sctrpi1                SCSI terminate rport I/O
      LUN            : 0xffffffffffffffff                     none (invalid)
      WWPN           : 0x<wwpn>
      D_ID           : 0x<n_port_id>
      Adapter status : 0x...
      Port status    : 0x...
      LUN status     : 0x00000000                             none (invalid)
      Ready count    : 0x...
      Running count  : 0x...
      ERP want       : 0x03                   ZFCP_ERP_ACTION_REOPEN_PORT_FORCED
      ERP need       : 0xe0                   ZFCP_ERP_ACTION_FAILED
      Signed-off-by: default avatarSteffen Maier <maier@linux.ibm.com>
      Cc: <stable@vger.kernel.org> #2.6.38+
      Reviewed-by: default avatarBenjamin Block <bblock@linux.ibm.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      d70aab55
    • Steffen Maier's avatar
      scsi: zfcp: fix missing REC trigger trace on terminate_rport_io early return · 96d92704
      Steffen Maier authored
      get_device() and its internally used kobject_get() only return NULL if they
      get passed NULL as argument. zfcp_get_port_by_wwpn() loops over
      adapter->port_list so the iteration variable port is always non-NULL.
      Struct device is embedded in struct zfcp_port so &port->dev is always
      non-NULL. This is the argument to get_device().  However, if we get an
      fc_rport in terminate_rport_io() for which we cannot find a match within
      zfcp_get_port_by_wwpn(), the latter can return NULL.  v2.6.30 commit
      70932935 ("[SCSI] zfcp: Fix oops when port disappears") introduced an
      early return without adding a trace record for this case.  Even if we don't
      need recovery in this case, for debugging we should still see that our
      callback was invoked originally by scsi_transport_fc.
      
      Example trace record formatted with zfcpdbf from s390-tools:
      
      Timestamp      : ...
      Area           : REC
      Subarea        : 00
      Level          : 1
      Exception      : -
      CPU ID         : ..
      Caller         : 0x...
      Record ID      : 1
      Tag            : sctrpin        SCSI terminate rport I/O, no zfcp port
      LUN            : 0xffffffffffffffff                     none (invalid)
      WWPN           : 0x<wwpn>               WWPN
      D_ID           : 0x<n_port_id>          N_Port-ID
      Adapter status : 0x...
      Port status    : 0xffffffff             unknown (-1)
      LUN status     : 0x00000000                             none (invalid)
      Ready count    : 0x...
      Running count  : 0x...
      ERP want       : 0x03                   ZFCP_ERP_ACTION_REOPEN_PORT_FORCED
      ERP need       : 0xc0                   ZFCP_ERP_ACTION_NONE
      Signed-off-by: default avatarSteffen Maier <maier@linux.ibm.com>
      Fixes: 70932935 ("[SCSI] zfcp: Fix oops when port disappears")
      Cc: <stable@vger.kernel.org> #2.6.38+
      Reviewed-by: default avatarBenjamin Block <bblock@linux.ibm.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      96d92704
    • Steffen Maier's avatar
      scsi: zfcp: fix misleading REC trigger trace where erp_action setup failed · 512857a7
      Steffen Maier authored
      If a SCSI device is deleted during scsi_eh host reset, we cannot get a
      reference to the SCSI device anymore since scsi_device_get returns !=0 by
      design. Assuming the recovery of adapter and port(s) was successful,
      zfcp_erp_strategy_followup_success() attempts to trigger a LUN reset for the
      half-gone SCSI device. Unfortunately, it causes the following confusing
      trace record which states that zfcp will do a LUN recovery as "ERP need" is
      ZFCP_ERP_ACTION_REOPEN_LUN == 1 and equals "ERP want".
      
      Old example trace record formatted with zfcpdbf from s390-tools:
      
      Tag:           : ersfs_3 ERP, trigger, unit reopen, port reopen succeeded
      LUN            : 0x<FCP_LUN>
      WWPN           : 0x<WWPN>
      D_ID           : 0x<N_Port-ID>
      Adapter status : 0x5400050b
      Port status    : 0x54000001
      LUN status     : 0x40000000     ZFCP_STATUS_COMMON_RUNNING
                                      but not ZFCP_STATUS_COMMON_UNBLOCKED as it
                                      was closed on close part of adapter reopen
      ERP want       : 0x01
      ERP need       : 0x01           misleading
      
      However, zfcp_erp_setup_act() returns NULL as it cannot get the reference.
      Hence, zfcp_erp_action_enqueue() takes an early goto out and _NO_ recovery
      actually happens.
      
      We always do want the recovery trigger trace record even if no erp_action
      could be enqueued as in this case. For other cases where we did not enqueue
      an erp_action, 'need' has always been zero to indicate this. In order to
      indicate above goto out, introduce an eyecatcher "flag" to mark the "ERP
      need" as 'not needed' but still keep the information which erp_action type,
      that zfcp_erp_required_act() had decided upon, is needed.  0xc_ is chosen to
      be visibly different from 0x0_ in "ERP want".
      
      New example trace record formatted with zfcpdbf from s390-tools:
      
      Tag:           : ersfs_3 ERP, trigger, unit reopen, port reopen succeeded
      LUN            : 0x<FCP_LUN>
      WWPN           : 0x<WWPN>
      D_ID           : 0x<N_Port-ID>
      Adapter status : 0x5400050b
      Port status    : 0x54000001
      LUN status     : 0x40000000
      ERP want       : 0x01
      ERP need       : 0xc1           would need LUN ERP, but no action set up
                         ^
      
      Before v2.6.38 commit ae0904f6 ("[SCSI] zfcp: Redesign of the debug
      tracing for recovery actions.") we could detect this case because the
      "erp_action" field in the trace was NULL. The rework removed erp_action as
      argument and field from the trace.
      
      This patch here is for tracing. A fix to allow LUN recovery in the case at
      hand is a topic for a separate patch.
      
      See also commit fdbd1c5e ("[SCSI] zfcp: Allow running unit/LUN shutdown
      without acquiring reference") for a similar case and background info.
      Signed-off-by: default avatarSteffen Maier <maier@linux.ibm.com>
      Fixes: ae0904f6 ("[SCSI] zfcp: Redesign of the debug tracing for recovery actions.")
      Cc: <stable@vger.kernel.org> #2.6.38+
      Reviewed-by: default avatarBenjamin Block <bblock@linux.ibm.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      512857a7
    • Steffen Maier's avatar
      scsi: zfcp: fix missing SCSI trace for retry of abort / scsi_eh TMF · 81979ae6
      Steffen Maier authored
      We already have a SCSI trace for the end of abort and scsi_eh TMF. Due to
      zfcp_erp_wait() and fc_block_scsi_eh() time can pass between the start of
      our eh callback and an actual send/recv of an abort / TMF request.  In order
      to see the temporal sequence including any abort / TMF send retries, add a
      trace before the above two blocking functions.  This supports problem
      determination with scsi_eh and parallel zfcp ERP.
      
      No need to explicitly trace the beginning of our eh callback, since we
      typically can send an abort / TMF and see its HBA response (in the worst
      case, it's a pseudo response on dismiss all of adapter recovery, e.g. due to
      an FSF request timeout [fsrth_1] of the abort / TMF). If we cannot send, we
      now get a trace record for the first "abrt_wt" or "[lt]r_wait" which denotes
      almost the beginning of the callback.
      
      No need to explicitly trace the wakeup after the above two blocking
      functions because the next retry loop causes another trace in any case and
      that is sufficient.
      
      Example trace records formatted with zfcpdbf from s390-tools:
      
      Timestamp      : ...
      Area           : SCSI
      Subarea        : 00
      Level          : 1
      Exception      : -
      CPU ID         : ..
      Caller         : 0x...
      Record ID      : 1
      Tag            : abrt_wt        abort, before zfcp_erp_wait()
      Request ID     : 0x0000000000000000                     none (invalid)
      SCSI ID        : 0x<scsi_id>
      SCSI LUN       : 0x<scsi_lun>
      SCSI LUN high  : 0x<scsi_lun_high>
      SCSI result    : 0x<scsi_result_of_cmd_to_be_aborted>
      SCSI retries   : 0x<retries_of_cmd_to_be_aborted>
      SCSI allowed   : 0x<allowed_retries_of_cmd_to_be_aborted>
      SCSI scribble  : 0x<req_id_of_cmd_to_be_aborted>
      SCSI opcode    : <CDB_of_cmd_to_be_aborted>
      FCP rsp inf cod: 0x..                                   none (invalid)
      FCP rsp IU     : ...                                    none (invalid)
      
      Timestamp      : ...
      Area           : SCSI
      Subarea        : 00
      Level          : 1
      Exception      : -
      CPU ID         : ..
      Caller         : 0x...
      Record ID      : 1
      Tag            : lr_wait        LUN reset, before zfcp_erp_wait()
      Request ID     : 0x0000000000000000                     none (invalid)
      SCSI ID        : 0x<scsi_id>
      SCSI LUN       : 0x<scsi_lun>
      SCSI LUN high  : 0x<scsi_lun_high>
      SCSI result    : 0x...                                  unrelated
      SCSI retries   : 0x..                                   unrelated
      SCSI allowed   : 0x..                                   unrelated
      SCSI scribble  : 0x...                                  unrelated
      SCSI opcode    : ...                                    unrelated
      FCP rsp inf cod: 0x..                                   none (invalid)
      FCP rsp IU     : ...                                    none (invalid)
      Signed-off-by: default avatarSteffen Maier <maier@linux.ibm.com>
      Fixes: 63caf367 ("[SCSI] zfcp: Improve reliability of SCSI eh handlers in zfcp")
      Fixes: af4de36d ("[SCSI] zfcp: Block scsi_eh thread for rport state BLOCKED")
      Cc: <stable@vger.kernel.org> #2.6.38+
      Reviewed-by: default avatarBenjamin Block <bblock@linux.ibm.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      81979ae6
    • Steffen Maier's avatar
      scsi: zfcp: fix missing SCSI trace for result of eh_host_reset_handler · df307816
      Steffen Maier authored
      For problem determination we need to see whether and why we were successful
      or not. This allows deduction of scsi_eh escalation.
      
      Example trace record formatted with zfcpdbf from s390-tools:
      
      Timestamp      : ...
      Area           : SCSI
      Subarea        : 00
      Level          : 1
      Exception      : -
      CPU ID         : ..
      Caller         : 0x...
      Record ID      : 1
      Tag            : schrh_r        SCSI host reset handler result
      Request ID     : 0x0000000000000000                     none (invalid)
      SCSI ID        : 0xffffffff                             none (invalid)
      SCSI LUN       : 0xffffffff                             none (invalid)
      SCSI LUN high  : 0xffffffff                             none (invalid)
      SCSI result    : 0x00002002     field re-used for midlayer value: SUCCESS
                                      or in other cases: 0x2009 == FAST_IO_FAIL
      SCSI retries   : 0xff                                   none (invalid)
      SCSI allowed   : 0xff                                   none (invalid)
      SCSI scribble  : 0xffffffffffffffff                     none (invalid)
      SCSI opcode    : ffffffff ffffffff ffffffff ffffffff    none (invalid)
      FCP rsp inf cod: 0xff                                   none (invalid)
      FCP rsp IU     : 00000000 00000000 00000000 00000000    none (invalid)
                       00000000 00000000
      
      v2.6.35 commit a1dbfddd ("[SCSI] zfcp: Pass return code from
      fc_block_scsi_eh to scsi eh") introduced the first return with something
      other than the previously hardcoded single SUCCESS return path.
      Signed-off-by: default avatarSteffen Maier <maier@linux.ibm.com>
      Fixes: a1dbfddd ("[SCSI] zfcp: Pass return code from fc_block_scsi_eh to scsi eh")
      Cc: <stable@vger.kernel.org> #2.6.38+
      Reviewed-by: default avatarJens Remus <jremus@linux.ibm.com>
      Reviewed-by: default avatarBenjamin Block <bblock@linux.ibm.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      df307816
    • Uma Krishnan's avatar
      scsi: cxlflash: Isolate external module dependencies · cd43c221
      Uma Krishnan authored
      Depending on the underlying transport, cxlflash has a dependency on either
      the CXL or OCXL drivers, which are enabled via their Kconfig option.
      Instead of having a module wide dependency on these config options, it is
      better to isolate the object modules that are dependent on the CXL and OCXL
      drivers and adjust the module dependencies accordingly.
      
      This commit isolates the object files that are dependent on CXL and/or
      OCXL. The cxl/ocxl fops used in the core driver are tucked under an ifdef to
      avoid compilation errors.
      Signed-off-by: default avatarUma Krishnan <ukrishn@linux.vnet.ibm.com>
      Acked-by: default avatarMatthew R. Ochs <mrochs@linux.vnet.ibm.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      cd43c221
    • Uma Krishnan's avatar
      scsi: cxlflash: Abstract hardware dependent assignments · de5d35af
      Uma Krishnan authored
      As a staging cleanup to support transport specific builds of the cxlflash
      module, relocate device dependent assignments to header files. This will
      avoid littering the core driver with conditional compilation logic.
      Signed-off-by: default avatarUma Krishnan <ukrishn@linux.vnet.ibm.com>
      Acked-by: default avatarMatthew R. Ochs <mrochs@linux.vnet.ibm.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      de5d35af
    • Uma Krishnan's avatar
      scsi: cxlflash: Add include guards to backend.h · 5e12397a
      Uma Krishnan authored
      The new header file, backend.h, that was recently added is missing the
      include guards. This commit adds the guards.
      Signed-off-by: default avatarUma Krishnan <ukrishn@linux.vnet.ibm.com>
      Acked-by: default avatarMatthew R. Ochs <mrochs@linux.vnet.ibm.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      5e12397a
    • Matthew R. Ochs's avatar
      scsi: cxlflash: Use local mutex for AFU serialization · e63a8d88
      Matthew R. Ochs authored
      AFUs can only process a single AFU command at a time. This is enforced with
      a global mutex situated within the AFU send routine. As this mutex has a
      global scope, it has the potential to unnecessarily block commands destined
      for other AFUs.
      
      Instead of using a global mutex, transition the mutex to be per-AFU. This
      will allow commands to only be blocked by siblings of the same AFU.
      Signed-off-by: default avatarMatthew R. Ochs <mrochs@linux.vnet.ibm.com>
      Signed-off-by: default avatarUma Krishnan <ukrishn@linux.vnet.ibm.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      e63a8d88
    • Uma Krishnan's avatar
      scsi: cxlflash: Acquire semaphore before invoking ioctl services · 32a9ae41
      Uma Krishnan authored
      When a superpipe process that makes use of virtual LUNs is terminated or
      killed abruptly, there is a possibility that the cxlflash driver could hang
      and deprive other operations on the adapter.
      
      The release fop registered to be invoked on a context close, detaches every
      LUN associated with the context. The underlying service to detach the LUN
      assumes it has been called with the read semaphore held, and releases the
      semaphore before any operation that could be time consuming.
      
      When invoked without holding the read semaphore, an opportunity is created
      for the semaphore's count to become negative when it is temporarily released
      during one of these potential lengthy operations. This negative count
      results in subsequent acquisition attempts taking forever, leading to the
      hang.
      
      To support the current design point of holding the semaphore on the ioctl()
      paths, the release fop should acquire it before invoking any ioctl services.
      Signed-off-by: default avatarUma Krishnan <ukrishn@linux.vnet.ibm.com>
      Acked-by: default avatarMatthew R. Ochs <mrochs@linux.vnet.ibm.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      32a9ae41
    • Uma Krishnan's avatar
      scsi: cxlflash: Limit the debug logs in the IO path · d58188c3
      Uma Krishnan authored
      The kernel log can get filled with debug messages from send_cmd_ioarrin()
      when dynamic debug is enabled for the cxlflash module and there is a lot of
      legacy I/O traffic.
      
      While these messages are necessary to debug issues that involve command
      tracking, the abundance of data can overwrite other useful data in the
      log. The best option available is to limit the messages that should serve
      most of the common use cases.
      Signed-off-by: default avatarUma Krishnan <ukrishn@linux.vnet.ibm.com>
      Acked-by: default avatarMatthew R. Ochs <mrochs@linux.vnet.ibm.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      d58188c3
    • Uma Krishnan's avatar
      scsi: cxlflash: Yield to active send threads · e0f76ad1
      Uma Krishnan authored
      The following Oops may be encountered if the device is reset, i.e. EEH
      recovery, while there is heavy I/O traffic:
      
      59:mon> t
      [c000200db64bb680] c008000009264c40 cxlflash_queuecommand+0x3b8/0x500
      					[cxlflash]
      [c000200db64bb770] c00000000090d3b0 scsi_dispatch_cmd+0x130/0x2f0
      [c000200db64bb7f0] c00000000090fdd8 scsi_request_fn+0x3c8/0x8d0
      [c000200db64bb900] c00000000067f528 __blk_run_queue+0x68/0xb0
      [c000200db64bb930] c00000000067ab80 __elv_add_request+0x140/0x3c0
      [c000200db64bb9b0] c00000000068daac blk_execute_rq_nowait+0xec/0x1a0
      [c000200db64bba00] c00000000068dbb0 blk_execute_rq+0x50/0xe0
      [c000200db64bba50] c0000000006b2040 sg_io+0x1f0/0x520
      [c000200db64bbaf0] c0000000006b2e94 scsi_cmd_ioctl+0x534/0x610
      [c000200db64bbc20] c000000000926208 sd_ioctl+0x118/0x280
      [c000200db64bbcc0] c00000000069f7ac blkdev_ioctl+0x7fc/0xe30
      [c000200db64bbd20] c000000000439204 block_ioctl+0x84/0xa0
      [c000200db64bbd40] c0000000003f8514 do_vfs_ioctl+0xd4/0xa00
      [c000200db64bbde0] c0000000003f8f04 SyS_ioctl+0xc4/0x130
      [c000200db64bbe30] c00000000000b184 system_call+0x58/0x6c
      
      When there is no room to send the I/O request, the cached room is refreshed
      by reading the memory mapped command room value from the AFU. The AFU
      register mapping is refreshed during a reset, creating a race condition that
      can lead to the Oops above.
      
      During a device reset, the AFU should not be unmapped until all the active
      send threads quiesce. An atomic counter, cmds_active, is currently used to
      track internal AFU commands and quiesce during reset. This same counter can
      also be used for the active send threads.
      Signed-off-by: default avatarUma Krishnan <ukrishn@linux.vnet.ibm.com>
      Acked-by: default avatarMatthew R. Ochs <mrochs@linux.vnet.ibm.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      e0f76ad1
    • Xiaofei Tan's avatar
      scsi: hisi_sas: add check of device in hisi_sas_task_exec() · 2f6bca20
      Xiaofei Tan authored
      Currently we don't check that device is not gone before dereferencing
      its elements in the function hisi_sas_task_exec() (specifically, the DQ
      pointer).
      
      This patch fixes this issue by filling in the DQ pointer in
      hisi_sas_task_prep() after we check that the device pointer is still
      safe to reference.
      
      [mkp: typo]
      Signed-off-by: default avatarXiaofei Tan <tanxiaofei@huawei.com>
      Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      2f6bca20
    • Xiang Chen's avatar
      scsi: hisi_sas: Use device lock to protect slot alloc/free · e85d93b2
      Xiang Chen authored
      The IPTT of a slot is unique, and we currently use hisi_hba lock to
      protect it.
      
      Now slot is managed on hisi_sas_device.list, so use DQ lock to protect
      for allocating and freeing the slot.
      Signed-off-by: default avatarXiang Chen <chenxiang66@hisilicon.com>
      Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      e85d93b2
    • Xiang Chen's avatar
      scsi: hisi_sas: Don't lock DQ for complete task sending · fa222db0
      Xiang Chen authored
      Currently we lock the DQ to protect whole delivery process.  So this
      stops us building slots for the same queue in parallel, and can affect
      performance.
      
      To optimise it, only lock the DQ during special periods, specifically
      when allocating a slot from the DQ and when delivering a slot to the HW.
      
      This approach is now safe, thanks to the previous patches to ensure that
      we always deliver a slot to the HW once allocated.
      Signed-off-by: default avatarXiang Chen <chenxiang66@hisilicon.com>
      Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      fa222db0
    • Xiang Chen's avatar
      scsi: hisi_sas: allocate slot buffer earlier · 3de0026d
      Xiang Chen authored
      Currently we allocate the slot's memory buffer after allocating the DQ
      slot.
      
      To aid DQ lockout reduction, and allow slots to be built in parallel,
      move this step (which can fail) prior to allocating the slot.
      
      Also a stray spin_unlock_irqrestore() is removed from internal task exec
      function.
      Signed-off-by: default avatarXiang Chen <chenxiang66@hisilicon.com>
      Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      3de0026d
    • Xiang Chen's avatar
      scsi: hisi_sas: make return type of prep functions void · a2b3820b
      Xiang Chen authored
      Since the task prep functions now should not fail, adjust the return
      types to void.
      
      In addition, some checks in the task prep functions are relocated to the
      main module; this is specifically the check for the number of elements
      in an sg list exceeded the HW SGE limit.
      Signed-off-by: default avatarXiang Chen <chenxiang66@hisilicon.com>
      Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      a2b3820b
    • Xiang Chen's avatar
      scsi: hisi_sas: relocate smp sg map · 7eee4b92
      Xiang Chen authored
      Currently we use DQ lock to protect delivery of DQ entry one by one.
      
      To optimise to allow more than one slot to be built for a single DQ in
      parallel, we need to remove the DQ lock when preparing slots, prior to
      delivery.
      
      To achieve this, we rearrange the slot build order to ensure that once
      we allocate a slot for a task, we do cannot fail to deliver the task.
      
      In this patch, we rearrange the slot building for SMP tasks to ensure
      that sg mapping part (which can fail) happens before we allocate the
      slot in the DQ.
      Signed-off-by: default avatarXiang Chen <chenxiang66@hisilicon.com>
      Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      7eee4b92
    • Alim Akhtar's avatar
      scsi: ufs: make ufshcd_config_pwr_mode of non-static func · 0d846e70
      Alim Akhtar authored
      This makes ufshcd_config_pwr_mode non-static so that other vendors like
      exynos can use it.
      Signed-off-by: default avatarSeungwon Jeon <essuuj@gmail.com>
      Signed-off-by: default avatarAlim Akhtar <alim.akhtar@samsung.com>
      Reviewed-by: default avatarAvri Altman <avri.altman@wdc.com>
      Reviewed-by: default avatarSubhash Jadavani <subhashj@codeaurora.org>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      0d846e70
    • Alim Akhtar's avatar
      scsi: ufs: add quirk to enable host controller without hce · 4404c5de
      Alim Akhtar authored
      Some host controllers don't support host controller enable via HCE.
      Signed-off-by: default avatarSeungwon Jeon <essuuj@gmail.com>
      Signed-off-by: default avatarAlim Akhtar <alim.akhtar@samsung.com>
      Reviewed-by: default avatarSubhash Jadavani <subhashj@codeaurora.org>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      4404c5de
    • Alim Akhtar's avatar
      scsi: ufs: add quirk to disallow reset of interrupt aggregation · 5ac6abc9
      Alim Akhtar authored
      Some host controllers support interrupt aggregation but don't allow
      resetting counter and timer in software.
      Signed-off-by: default avatarSeungwon Jeon <essuuj@gmail.com>
      Signed-off-by: default avatarAlim Akhtar <alim.akhtar@samsung.com>
      Reviewed-by: default avatarSubhash Jadavani <subhashj@codeaurora.org>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      5ac6abc9
    • Alim Akhtar's avatar
      scsi: ufs: add quirk to fix mishandling utrlclr/utmrlclr · 1399c5b0
      Alim Akhtar authored
      In the right behavior, setting the bit to '0' indicates clear and '1'
      indicates no change. If host controller handles this the other way,
      UFSHCI_QUIRK_BROKEN_REQ_LIST_CLR can be used.
      
      [mkp: typo]
      Signed-off-by: default avatarSeungwon Jeon <essuuj@gmail.com>
      Signed-off-by: default avatarAlim Akhtar <alim.akhtar@samsung.com>
      Reviewed-by: default avatarSubhash Jadavani <subhashj@codeaurora.org>
      Reviewed-by: default avatar"Asutosh Das (asd)" <asutoshd@codeaurora.org>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      1399c5b0
    • Kees Cook's avatar
      scsi: ufs: ufshcd: Remove VLA usage · bbe21d7a
      Kees Cook authored
      On the quest to remove all VLAs from the kernel[1] this moves buffers
      off the stack. In the second instance, this collapses two separately
      allocated buffers into a single buffer, since they are used
      consecutively, which saves 256 bytes (QUERY_DESC_MAX_SIZE + 1) of stack
      space.
      
      [1] https://lkml.kernel.org/r/CA+55aFzCG-zNmZwX4A2FQpadafLfEzK6CC=qPXydAacU1RqZWA@mail.gmail.comSigned-off-by: default avatarKees Cook <keescook@chromium.org>
      Reviewed-by: default avatarSubhash Jadavani <subhashj@codeaurora.org>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      bbe21d7a
  2. 15 May, 2018 5 commits
  3. 08 May, 2018 7 commits