NAK/cmnt: [SRU][PULL REQUEST][J][PATCH 00/18][mpi3mr: Add management application interface(BSG) support

Tim Gardner tim.gardner at canonical.com
Fri Jan 20 13:53:21 UTC 2023


> On Thu, Jan 19, 2023 at 1:24 PM Tim Gardner <tim.gardner at canonical.com 
> <mailto:tim.gardner at canonical.com>> wrote:
> 
>     On 1/18/23 5:41 PM, Michael Reed wrote:
>      > From: Michael Reed <Michael.Reed at canonical.com
>     <mailto:Michael.Reed at canonical.com>>
>      >
>      >
>      > BugLink: https://bugs.launchpad.net/bugs/1971151
>     <https://bugs.launchpad.net/bugs/1971151>
>      >
>      > SRU Justification:
>      >
>      > [Impact]
>      >
>      > Request to include below mpi3mr driver bug fix patches in Ubuntu
>     22.04.1(5.15 kernel). These patches got accepted by the upstream and
>     please find the corresponding commit IDs as below:
>      >
>      > f304d35e5995 scsi: mpi3mr: Update driver version to 8.0.0.69.0
>      > 7dbd0dd8cde3 scsi: mpi3mr: Add support for NVMe passthrough
>      > 986d6bad2103 scsi: mpi3mr: Expose adapter state to sysfs
>      > 43ca11005098 scsi: mpi3mr: Add support for PEL commands
>      > 506bc1a0d6ba scsi: mpi3mr: Add support for MPT commands
>      > f3de4706c1e0 scsi: mpi3mr: Move data structures/definitions from
>     MPI headers to uapi header
>      > f5e6d5a34376 scsi: mpi3mr: Add support for driver commands
>      > 4268fa751365 scsi: mpi3mr: Add bsg device support
>      > 1fcbe4c49039 scsi: mpi3mr: Fix kernel-doc
>      > 4094981db7b6 scsi: mpi3mr: Rework mrioc->bsg_device model to fix
>     warnings
>      > 9feb5c4c3f95 scsi: mpi3mr: Add target device related sysfs attributes
>      > e51e76edddb1 scsi: mpi3mr: Add shost related sysfs attributes
>      > bc7896d31a92 scsi: mpi3mr: Return error if dma_alloc_coherent() fails
>      > a25eafd13e5f scsi: mpi3mr: Fix a NULL vs IS_ERR() bug in
>     mpi3mr_bsg_init()
>      > 256bd4f23d9c scsi: mpi3mr: Return I/Os to an unrecoverable HBA
>     with DID_ERROR
>      > 2dd8389f96d6 scsi: mpi3mr: Hidden drives not removed during soft
>     reset
>      > 1aa529d40025 scsi: mpi3mr: Increase I/O timeout value to 60s
>      >
>      > [Test Plan]
>      >
>      > 1. Install and boot kernel
>      > 2. Run basic I/O tests
>      >
>      > [Where problems could occur]
>      >
>      > Moderate to low regression risk for the kernel as most changes
>     are in the driver
>      >
>      >
>      > The following changes since commit
>     b44ab75bef7b3e6a4fe02fc25eaec90d847662c6:
>      >
>      >    DROP BEFORE CRANK: Reminder to skip an upload number
>     (2022-08-12 17:27:59 +0200)
>      >
>      > are available in the Git repository at:
>      >
>      >
>     https://code.launchpad.net/~mreed8855/ubuntu/+source/linux/+git/jammy/+ref/mpi3mr_bsg_support_1 <https://code.launchpad.net/~mreed8855/ubuntu/+source/linux/+git/jammy/+ref/mpi3mr_bsg_support_1>
>      >
>      > for you to fetch changes up to
>     0296206fca4c5a727be0c4a7c0a4174f92047e8e:
>      >
>      >    UBUNTU: SAUCE: (no-up) mpi3mr -- Adjustments had to be made
>     for two patches to build. (2023-01-18 16:50:07 -0600)
>      >
>      > ----------------------------------------------------------------
>      > Dan Carpenter (2):
>      >        scsi: mpi3mr: Fix a NULL vs IS_ERR() bug in mpi3mr_bsg_init()
>      >        scsi: mpi3mr: Return error if dma_alloc_coherent() fails
>      >
>      > Jiapeng Chong (1):
>      >        scsi: mpi3mr: Fix kernel-doc
>      >
>      > Michael Reed (1):
>      >        UBUNTU: SAUCE: (no-up) mpi3mr -- Adjustments had to be
>     made for two patches to build.
>      >
>      > Sreekanth Reddy (5):
>      >        scsi: mpi3mr: Increase I/O timeout value to 60s
>      >        scsi: mpi3mr: Hidden drives not removed during soft reset
>      >        scsi: mpi3mr: Return I/Os to an unrecoverable HBA with
>     DID_ERROR
>      >        scsi: mpi3mr: Add shost related sysfs attributes
>      >        scsi: mpi3mr: Add target device related sysfs attributes
>      >
>      > Sumit Saxena (9):
>      >        scsi: mpi3mr: Add bsg device support
>      >        scsi: mpi3mr: Add support for driver commands
>      >        scsi: mpi3mr: Move data structures/definitions from MPI
>     headers to uapi header
>      >        scsi: mpi3mr: Add support for MPT commands
>      >        scsi: mpi3mr: Add support for PEL commands
>      >        scsi: mpi3mr: Expose adapter state to sysfs
>      >        scsi: mpi3mr: Add support for NVMe passthrough
>      >        scsi: mpi3mr: Update driver version to 8.0.0.69.0
>      >        scsi: mpi3mr: Rework mrioc->bsg_device model to fix warnings
>      >
>      >   drivers/scsi/mpi3mr/Kconfig          |    1 +
>      >   drivers/scsi/mpi3mr/Makefile         |    1 +
>      >   drivers/scsi/mpi3mr/mpi/mpi30_init.h |   53 -
>      >   drivers/scsi/mpi3mr/mpi/mpi30_ioc.h  |   27 -
>      >   drivers/scsi/mpi3mr/mpi/mpi30_pci.h  |   31 +-
>      >   drivers/scsi/mpi3mr/mpi3mr.h         |  137 ++-
>      >   drivers/scsi/mpi3mr/mpi3mr_app.c     | 1860
>     ++++++++++++++++++++++++++++++++++
>      >   drivers/scsi/mpi3mr/mpi3mr_debug.h   |   37 +-
>      >   drivers/scsi/mpi3mr/mpi3mr_fw.c      |  335 +++++-
>      >   drivers/scsi/mpi3mr/mpi3mr_os.c      |   70 +-
>      >   include/uapi/scsi/scsi_bsg_mpi3mr.h  |  582 +++++++++++
>      >   11 files changed, 3003 insertions(+), 131 deletions(-)
>      >   create mode 100644 drivers/scsi/mpi3mr/mpi3mr_app.c
>      >   create mode 100644 include/uapi/scsi/scsi_bsg_mpi3mr.h
>      >
> 
>     While all of the cherry-picks apply cleanly, the 2 patches mentioned in
>     'UBUNTU: SAUCE: (no-up) mpi3mr -- Adjustments had to be made for two
>     patches to build.' should have those changes folded in as backports.
>     Otherwise you break bisect compilation.
> 
>     -- 
>     -----------
>     Tim Gardner
>     Canonical, Inc
> 

On 1/19/23 3:00 PM, Michael Reed wrote:
 > HI Tim,
 >
 > Just to clarify,  I just need to change  "UBUNTU: SAUCE: (no-up) mpi3mr
 > -- Adjustments had to be made for two patches to build."  to a
 > backport?  And leave the original patches mentioned intact as 
cherry-picks?
 >
 > - Michael
 >

No, you drop [1], then take the code changes that are in [1] and fold 
them in to their respective commits. Those commits then become 
backports. Be sure to add a short explanation of the backport to each of 
those commits.

rtg

[1] - "UBUNTU: SAUCE: (no-up) mpi3mr -- Adjustments had to be made for 
two patches to build."

P.S. mixing top and bottom posting is bad
-- 
-----------
Tim Gardner
Canonical, Inc




More information about the kernel-team mailing list