SCSI fixes for 5.8-rc3
Subsystems (4)
James Bottomley
maintainerFour small fixes in three drivers. The mptfusion one has actually caused use visible issues in certain kernel configurations.
The patch is available here:
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes
The short changelog is:
Christoph Hellwig (1):
scsi: mptfusion: Don't use GFP_ATOMIC for larger DMA allocations
Dan Carpenter (1):
scsi: qla2xxx: Fix a condition in qla2x00_find_all_fabric_devs()
Javed Hasan (2):
scsi: libfc: Skip additional kref updating work event
scsi: libfc: Handling of extra kref
And the diffstat:
drivers/message/fusion/mptbase.c | 41 ++++++++++++++++++++-------------------- drivers/scsi/libfc/fc_rport.c | 13 ++++++++----- drivers/scsi/qla2xxx/qla_init.c | 2 +- 3 files changed, 29 insertions(+), 27 deletions(-)
With full diff below.
James
---
drivers/message/fusion/mptbase.c +20 -21
@@ -1324,13 +1324,13 @@ mpt_host_page_alloc(MPT_ADAPTER *ioc, pIOCInit_t ioc_init)return 0 ;/* fw doesn't need any host buffers */ /* spin till we get enough memory */ -while (host_page_buffer_sz >0 ) { - -if ((ioc->HostPageBuffer =pci_alloc_consistent ( - ioc->pcidev, - host_page_buffer_sz, - &ioc->HostPageBuffer_dma)) !=NULL ) { - +while (host_page_buffer_sz >0 ) { + ioc->HostPageBuffer = +dma_alloc_coherent (&ioc->pcidev->dev, + host_page_buffer_sz, + &ioc->HostPageBuffer_dma, +GFP_KERNEL ); +if (ioc->HostPageBuffer) { dinitprintk(ioc, printk(MYIOC_s_DEBUG_FMT "host_page_buffer @ %p, dma @ %x, sz=%d bytes\n", ioc->name, ioc->HostPageBuffer,
@@ -2741,8 +2741,8 @@ mpt_adapter_disable(MPT_ADAPTER *ioc) sz = ioc->alloc_sz;dexitprintk (ioc,printk (MYIOC_s_INFO_FMT"free @ %p, sz=%d bytes\n" , ioc->name, ioc->alloc, ioc->alloc_sz)); -pci_free_consistent (ioc->pcidev, sz, - ioc->alloc, ioc->alloc_dma); +dma_free_coherent (&ioc->pcidev->dev, sz, ioc->alloc, + ioc->alloc_dma); ioc->reply_frames =NULL ; ioc->req_frames =NULL ; ioc->alloc =NULL ;
@@ -2751,8 +2751,8 @@ mpt_adapter_disable(MPT_ADAPTER *ioc)if (ioc->sense_buf_pool !=NULL ) { sz = (ioc->req_depth *MPT_SENSE_BUFFER_ALLOC ); -pci_free_consistent (ioc->pcidev, sz, - ioc->sense_buf_pool, ioc->sense_buf_pool_dma); +dma_free_coherent (&ioc->pcidev->dev, sz, ioc->sense_buf_pool, + ioc->sense_buf_pool_dma); ioc->sense_buf_pool =NULL ; ioc->alloc_total -= sz; }
@@ -2802,7 +2802,7 @@ mpt_adapter_disable(MPT_ADAPTER *ioc)"HostPageBuffer free @ %p, sz=%d bytes\n" , ioc->name, ioc->HostPageBuffer, ioc->HostPageBuffer_sz)); -pci_free_consistent (ioc->pcidev, ioc->HostPageBuffer_sz, +dma_free_coherent (&ioc->pcidev->dev, ioc->HostPageBuffer_sz, ioc->HostPageBuffer, ioc->HostPageBuffer_dma); ioc->HostPageBuffer =NULL ; ioc->HostPageBuffer_sz =0 ;
@@ -4497,7 +4497,8 @@ PrimeIocFifos(MPT_ADAPTER *ioc) ioc->name, sz, sz, num_chain)); total_size += sz; - mem =pci_alloc_consistent (ioc->pcidev, total_size, &alloc_dma); + mem =dma_alloc_coherent (&ioc->pcidev->dev, total_size, + &alloc_dma,GFP_KERNEL );if (mem ==NULL ) {printk (MYIOC_s_ERR_FMT"Unable to allocate Reply, Request, Chain Buffers!\n" , ioc->name);
@@ -4574,8 +4575,8 @@ PrimeIocFifos(MPT_ADAPTER *ioc)spin_unlock_irqrestore (&ioc->FreeQlock, flags); sz = (ioc->req_depth *MPT_SENSE_BUFFER_ALLOC ); - ioc->sense_buf_pool = -pci_alloc_consistent (ioc->pcidev, sz, &ioc->sense_buf_pool_dma); + ioc->sense_buf_pool =dma_alloc_coherent (&ioc->pcidev->dev, sz, + &ioc->sense_buf_pool_dma,GFP_KERNEL );if (ioc->sense_buf_pool ==NULL ) {printk (MYIOC_s_ERR_FMT"Unable to allocate Sense Buffers!\n" , ioc->name);
@@ -4613,18 +4614,16 @@ PrimeIocFifos(MPT_ADAPTER *ioc)if (ioc->alloc !=NULL ) { sz = ioc->alloc_sz; -pci_free_consistent (ioc->pcidev, - sz, - ioc->alloc, ioc->alloc_dma); +dma_free_coherent (&ioc->pcidev->dev, sz, ioc->alloc, + ioc->alloc_dma); ioc->reply_frames =NULL ; ioc->req_frames =NULL ; ioc->alloc_total -= sz; }if (ioc->sense_buf_pool !=NULL ) { sz = (ioc->req_depth *MPT_SENSE_BUFFER_ALLOC ); -pci_free_consistent (ioc->pcidev, - sz, - ioc->sense_buf_pool, ioc->sense_buf_pool_dma); +dma_free_coherent (&ioc->pcidev->dev, sz, ioc->sense_buf_pool, + ioc->sense_buf_pool_dma); ioc->sense_buf_pool =NULL ; }
drivers/scsi/libfc/fc_rport.c +8 -5
@@ -133,8 +133,10 @@ struct fc_rport_priv *fc_rport_create(struct fc_lport *lport, u32 port_id)lockdep_assert_held (&lport->disc.disc_mutex); rdata =fc_rport_lookup (lport, port_id); -if (rdata) +if (rdata) { +kref_put (&rdata->kref, fc_rport_destroy);return rdata; + }if (lport->rport_priv_size >0 ) rport_priv_size = lport->rport_priv_size;
@@ -481,10 +483,11 @@ static void fc_rport_enter_delete(struct fc_rport_priv *rdata,fc_rport_state_enter (rdata,RPORT_ST_DELETE ); -kref_get (&rdata->kref); -if (rdata->event ==RPORT_EV_NONE && - !queue_work (rport_event_queue, &rdata->event_work)) -kref_put (&rdata->kref, fc_rport_destroy); +if (rdata->event ==RPORT_EV_NONE ) { +kref_get (&rdata->kref); +if (!queue_work (rport_event_queue, &rdata->event_work)) +kref_put (&rdata->kref, fc_rport_destroy); + } rdata->event = event; }
drivers/scsi/qla2xxx/qla_init.c +1 -1
@@ -5944,7 +5944,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha)break ; } -if (NVME_TARGET (vha->hw, fcport)) { +if (found &&NVME_TARGET (vha->hw, fcport)) {if (fcport->disc_state ==DSC_DELETE_PEND ) {qla2x00_set_fcport_disc_state (fcport,DSC_GNL ); vha->fcport_count--;
The pull request you sent on Sun, 05 Jul 2020 08:22:50 -0700:
The pull request you sent on Sun, 05 Jul 2020 08:22:50 -0700:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.gitscsi-fixes
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/19a61a753d0705fcb41e7aa130351e0a0a54c3bd
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker