* [PATCH V4] Save command pool address of Scsi_Host
@ 2014-08-04 11:24 jgross
2014-08-04 11:28 ` Juergen Gross
0 siblings, 1 reply; 2+ messages in thread
From: jgross @ 2014-08-04 11:24 UTC (permalink / raw)
To: James.Bottomley, hch, linux-scsi, linux-kernel; +Cc: Juergen Gross
From: Juergen Gross <jgross@suse.com>
If a scsi host driver specifies .cmd_len in it's scsi_host_template, a driver's
private command pool is needed. scsi_find_host_cmd_pool() will locate it, but
scsi_alloc_host_cmd_pool() isn't saving the pool address in the host template.
This will result in an access error when the host is removed.
Avoid the problem by saving the address of a new allocated command pool where
it is expected.
Signed-off-by: Juergen Gross <jgross@suse.com>
---
drivers/scsi/scsi.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 88d46fe..f654ac1 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -380,6 +380,10 @@ scsi_alloc_host_cmd_pool(struct Scsi_Host *shost)
pool->slab_flags |= SLAB_CACHE_DMA;
pool->gfp_mask = __GFP_DMA;
}
+
+ if (hostt->cmd_size)
+ hostt->cmd_pool = pool;
+
return pool;
}
@@ -424,8 +428,10 @@ out:
out_free_slab:
kmem_cache_destroy(pool->cmd_slab);
out_free_pool:
- if (hostt->cmd_size)
- scsi_free_host_cmd_pool(pool);
+ if (hostt->cmd_size) {
+ scsi_free_host_cmd_pool(hostt->cmd_pool);
+ hostt->cmd_pool = NULL;
+ }
goto out;
}
@@ -447,8 +453,10 @@ static void scsi_put_host_cmd_pool(struct Scsi_Host *shost)
if (!--pool->users) {
kmem_cache_destroy(pool->cmd_slab);
kmem_cache_destroy(pool->sense_slab);
- if (hostt->cmd_size)
- scsi_free_host_cmd_pool(pool);
+ if (hostt->cmd_size) {
+ scsi_free_host_cmd_pool(hostt->cmd_pool);
+ hostt->cmd_pool = NULL;
+ }
}
mutex_unlock(&host_cmd_pool_mutex);
}
--
1.8.4.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH V4] Save command pool address of Scsi_Host
2014-08-04 11:24 [PATCH V4] Save command pool address of Scsi_Host jgross
@ 2014-08-04 11:28 ` Juergen Gross
0 siblings, 0 replies; 2+ messages in thread
From: Juergen Gross @ 2014-08-04 11:28 UTC (permalink / raw)
To: James.Bottomley, hch, linux-scsi, linux-kernel
On 08/04/2014 01:24 PM, jgross@suse.com wrote:
> From: Juergen Gross <jgross@suse.com>
>
> If a scsi host driver specifies .cmd_len in it's scsi_host_template, a driver's
> private command pool is needed. scsi_find_host_cmd_pool() will locate it, but
> scsi_alloc_host_cmd_pool() isn't saving the pool address in the host template.
>
> This will result in an access error when the host is removed.
>
> Avoid the problem by saving the address of a new allocated command pool where
> it is expected.
Please ignore, should have used pool instead hostt->cm_pool for calling
scsi_free_host_cmd_pool(). V5 follows...
Juergen
>
> Signed-off-by: Juergen Gross <jgross@suse.com>
> ---
> drivers/scsi/scsi.c | 16 ++++++++++++----
> 1 file changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
> index 88d46fe..f654ac1 100644
> --- a/drivers/scsi/scsi.c
> +++ b/drivers/scsi/scsi.c
> @@ -380,6 +380,10 @@ scsi_alloc_host_cmd_pool(struct Scsi_Host *shost)
> pool->slab_flags |= SLAB_CACHE_DMA;
> pool->gfp_mask = __GFP_DMA;
> }
> +
> + if (hostt->cmd_size)
> + hostt->cmd_pool = pool;
> +
> return pool;
> }
>
> @@ -424,8 +428,10 @@ out:
> out_free_slab:
> kmem_cache_destroy(pool->cmd_slab);
> out_free_pool:
> - if (hostt->cmd_size)
> - scsi_free_host_cmd_pool(pool);
> + if (hostt->cmd_size) {
> + scsi_free_host_cmd_pool(hostt->cmd_pool);
> + hostt->cmd_pool = NULL;
> + }
> goto out;
> }
>
> @@ -447,8 +453,10 @@ static void scsi_put_host_cmd_pool(struct Scsi_Host *shost)
> if (!--pool->users) {
> kmem_cache_destroy(pool->cmd_slab);
> kmem_cache_destroy(pool->sense_slab);
> - if (hostt->cmd_size)
> - scsi_free_host_cmd_pool(pool);
> + if (hostt->cmd_size) {
> + scsi_free_host_cmd_pool(hostt->cmd_pool);
> + hostt->cmd_pool = NULL;
> + }
> }
> mutex_unlock(&host_cmd_pool_mutex);
> }
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-08-04 11:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-04 11:24 [PATCH V4] Save command pool address of Scsi_Host jgross
2014-08-04 11:28 ` Juergen Gross
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.