Commit 7622976c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull SCSI fixes from James Bottomley:
 "Ten patches, eight in drivers and two in the core, which correct a
  regression from directory removal and add a no VPD size quirk also to
  fix a regression. All pretty small"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: ufs: mcq: Use active_reqs to check busy in clock scaling
  scsi: core: Fix a procfs host directory removal regression
  scsi: core: Add BLIST_NO_VPD_SIZE for some VDASD
  scsi: mpi3mr: Fix expander node leak in mpi3mr_remove()
  scsi: mpi3mr: Fix memory leaks in mpi3mr_init_ioc()
  scsi: mpi3mr: Fix sas_hba.phy memory leak in mpi3mr_remove()
  scsi: mpi3mr: Fix mpi3mr_hba_port memory leak in mpi3mr_remove()
  scsi: mpi3mr: Fix config page DMA memory leak
  scsi: mpi3mr: Fix throttle_groups memory leak
  scsi: mpt3sas: Fix NULL pointer access in mpt3sas_transport_port_add()
parents 38e04b3e c6001025

drivers/scsi/hosts.c

+0 −3
Original line number Diff line number Diff line
@@ -341,9 +341,6 @@ static void scsi_host_dev_release(struct device *dev) 
	struct Scsi_Host *shost = dev_to_shost(dev);

	struct device *parent = dev->parent;



	/* In case scsi_remove_host() has not been called. */

	scsi_proc_hostdir_rm(shost->hostt);



	/* Wait for functions invoked through call_rcu(&scmd->rcu, ...) */

	rcu_barrier();

drivers/scsi/mpi3mr/mpi3mr.h

+2 −0
Original line number Diff line number Diff line
@@ -1393,4 +1393,6 @@ void mpi3mr_flush_drv_cmds(struct mpi3mr_ioc *mrioc); 
void mpi3mr_flush_cmds_for_unrecovered_controller(struct mpi3mr_ioc *mrioc);

void mpi3mr_free_enclosure_list(struct mpi3mr_ioc *mrioc);

int mpi3mr_process_admin_reply_q(struct mpi3mr_ioc *mrioc);

void mpi3mr_expander_node_remove(struct mpi3mr_ioc *mrioc,

	struct mpi3mr_sas_node *sas_expander);

#endif /*MPI3MR_H_INCLUDED*/

drivers/scsi/mpi3mr/mpi3mr_fw.c

+31 −19
Original line number Diff line number Diff line
@@ -3837,16 +3837,18 @@ int mpi3mr_init_ioc(struct mpi3mr_ioc *mrioc) 


	mpi3mr_print_ioc_info(mrioc);



	if (!mrioc->cfg_page) {

		dprint_init(mrioc, "allocating config page buffers\n");

		mrioc->cfg_page_sz = MPI3MR_DEFAULT_CFG_PAGE_SZ;

		mrioc->cfg_page = dma_alloc_coherent(&mrioc->pdev->dev,

	    MPI3MR_DEFAULT_CFG_PAGE_SZ, &mrioc->cfg_page_dma, GFP_KERNEL);

		    mrioc->cfg_page_sz, &mrioc->cfg_page_dma, GFP_KERNEL);

		if (!mrioc->cfg_page) {

			retval = -1;

			goto out_failed_noretry;

		}

	}



	mrioc->cfg_page_sz = MPI3MR_DEFAULT_CFG_PAGE_SZ;



	if (!mrioc->init_cmds.reply) {

		retval = mpi3mr_alloc_reply_sense_bufs(mrioc);

		if (retval) {

			ioc_err(mrioc,
@@ -3854,13 +3856,16 @@ int mpi3mr_init_ioc(struct mpi3mr_ioc *mrioc) 
			    __func__, retval);

			goto out_failed_noretry;

		}

	}



	if (!mrioc->chain_sgl_list) {

		retval = mpi3mr_alloc_chain_bufs(mrioc);

		if (retval) {

			ioc_err(mrioc, "Failed to allocated chain buffers %d\n",

			    retval);

			goto out_failed_noretry;

		}

	}



	retval = mpi3mr_issue_iocinit(mrioc);

	if (retval) {
@@ -4382,13 +4387,20 @@ void mpi3mr_free_mem(struct mpi3mr_ioc *mrioc) 
		    mrioc->admin_req_base, mrioc->admin_req_dma);

		mrioc->admin_req_base = NULL;

	}



	if (mrioc->cfg_page) {

		dma_free_coherent(&mrioc->pdev->dev, mrioc->cfg_page_sz,

		    mrioc->cfg_page, mrioc->cfg_page_dma);

		mrioc->cfg_page = NULL;

	}

	if (mrioc->pel_seqnum_virt) {

		dma_free_coherent(&mrioc->pdev->dev, mrioc->pel_seqnum_sz,

		    mrioc->pel_seqnum_virt, mrioc->pel_seqnum_dma);

		mrioc->pel_seqnum_virt = NULL;

	}



	kfree(mrioc->throttle_groups);

	mrioc->throttle_groups = NULL;



	kfree(mrioc->logdata_buf);

	mrioc->logdata_buf = NULL;

drivers/scsi/mpi3mr/mpi3mr_os.c

+24 −0
Original line number Diff line number Diff line
@@ -5078,6 +5078,8 @@ static void mpi3mr_remove(struct pci_dev *pdev) 
	struct workqueue_struct	*wq;

	unsigned long flags;

	struct mpi3mr_tgt_dev *tgtdev, *tgtdev_next;

	struct mpi3mr_hba_port *port, *hba_port_next;

	struct mpi3mr_sas_node *sas_expander, *sas_expander_next;



	if (!shost)

		return;
@@ -5117,6 +5119,28 @@ static void mpi3mr_remove(struct pci_dev *pdev) 
	mpi3mr_free_mem(mrioc);

	mpi3mr_cleanup_resources(mrioc);



	spin_lock_irqsave(&mrioc->sas_node_lock, flags);

	list_for_each_entry_safe_reverse(sas_expander, sas_expander_next,

	    &mrioc->sas_expander_list, list) {

		spin_unlock_irqrestore(&mrioc->sas_node_lock, flags);

		mpi3mr_expander_node_remove(mrioc, sas_expander);

		spin_lock_irqsave(&mrioc->sas_node_lock, flags);

	}

	list_for_each_entry_safe(port, hba_port_next, &mrioc->hba_port_table_list, list) {

		ioc_info(mrioc,

		    "removing hba_port entry: %p port: %d from hba_port list\n",

		    port, port->port_id);

		list_del(&port->list);

		kfree(port);

	}

	spin_unlock_irqrestore(&mrioc->sas_node_lock, flags);



	if (mrioc->sas_hba.num_phys) {

		kfree(mrioc->sas_hba.phy);

		mrioc->sas_hba.phy = NULL;

		mrioc->sas_hba.num_phys = 0;

	}



	spin_lock(&mrioc_list_lock);

	list_del(&mrioc->list);

	spin_unlock(&mrioc_list_lock);

drivers/scsi/mpi3mr/mpi3mr_transport.c

+1 −4
Original line number Diff line number Diff line
@@ -9,9 +9,6 @@ 


#include "mpi3mr.h"



static void mpi3mr_expander_node_remove(struct mpi3mr_ioc *mrioc,

	struct mpi3mr_sas_node *sas_expander);



/**

 * mpi3mr_post_transport_req - Issue transport requests and wait

 * @mrioc: Adapter instance reference
@@ -2164,7 +2161,7 @@ int mpi3mr_expander_add(struct mpi3mr_ioc *mrioc, u16 handle) 
 *

 * Return nothing.

 */

static void mpi3mr_expander_node_remove(struct mpi3mr_ioc *mrioc,

void mpi3mr_expander_node_remove(struct mpi3mr_ioc *mrioc,

	struct mpi3mr_sas_node *sas_expander)

{

	struct mpi3mr_sas_port *mr_sas_port, *next;