[PATCH] mmc: Add missing sg_init_table() call

[PATCH] mmc: Add missing sg_init_table() call

[Haavard Skinnemoen]

mmc_init_queue only initializes the scatterlists with sg_init_table()
when using a bounce buffer. This leads to a BUG() when CONFIG_DEBUG_SG
is set.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
---
 drivers/mmc/card/queue.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c
index 1b9c9b6..30cd13b 100644
--- a/drivers/mmc/card/queue.c
+++ b/drivers/mmc/card/queue.c
@@ -180,12 +180,13 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lock
 		blk_queue_max_hw_segments(mq->queue, host->max_hw_segs);
 		blk_queue_max_segment_size(mq->queue, host->max_seg_size);
 
-		mq->sg = kzalloc(sizeof(struct scatterlist) *
+		mq->sg = kmalloc(sizeof(struct scatterlist) *
 			host->max_phys_segs, GFP_KERNEL);
 		if (!mq->sg) {
 			ret = -ENOMEM;
 			goto cleanup_queue;
 		}
+		sg_init_table(mq->sg, host->max_phys_segs);
 	}
 
 	init_MUTEX(&mq->thread_sem);
-- 
1.5.3.4

Re: [PATCH] mmc: Add missing sg_init_table() call

[Jens Axboe]

On Thu, Nov 22 2007, Haavard Skinnemoen wrote:
> mmc_init_queue only initializes the scatterlists with sg_init_table()
> when using a bounce buffer. This leads to a BUG() when CONFIG_DEBUG_SG
> is set.
> 
> Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
> ---
>  drivers/mmc/card/queue.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c
> index 1b9c9b6..30cd13b 100644
> --- a/drivers/mmc/card/queue.c
> +++ b/drivers/mmc/card/queue.c
> @@ -180,12 +180,13 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lock
>  		blk_queue_max_hw_segments(mq->queue, host->max_hw_segs);
>  		blk_queue_max_segment_size(mq->queue, host->max_seg_size);
>  
> -		mq->sg = kzalloc(sizeof(struct scatterlist) *
> +		mq->sg = kmalloc(sizeof(struct scatterlist) *
>  			host->max_phys_segs, GFP_KERNEL);
>  		if (!mq->sg) {
>  			ret = -ENOMEM;
>  			goto cleanup_queue;
>  		}
> +		sg_init_table(mq->sg, host->max_phys_segs);
>  	}
>  
>  	init_MUTEX(&mq->thread_sem);

Applied

-- 
Jens Axboe

Re: [PATCH] mmc: Add missing sg_init_table() call

[Andrew Morton]

On Thu, 22 Nov 2007 20:32:51 +0100 Haavard Skinnemoen <hskinnemoen@atmel.com> wrote:

> mmc_init_queue only initializes the scatterlists with sg_init_table()
> when using a bounce buffer. This leads to a BUG() when CONFIG_DEBUG_SG
> is set.
> 

I assume that 2.6.23 is not afflicted in this way?

> ---
>  drivers/mmc/card/queue.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c
> index 1b9c9b6..30cd13b 100644
> --- a/drivers/mmc/card/queue.c
> +++ b/drivers/mmc/card/queue.c
> @@ -180,12 +180,13 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lock
>  		blk_queue_max_hw_segments(mq->queue, host->max_hw_segs);
>  		blk_queue_max_segment_size(mq->queue, host->max_seg_size);
>  
> -		mq->sg = kzalloc(sizeof(struct scatterlist) *
> +		mq->sg = kmalloc(sizeof(struct scatterlist) *
>  			host->max_phys_segs, GFP_KERNEL);
>  		if (!mq->sg) {
>  			ret = -ENOMEM;
>  			goto cleanup_queue;
>  		}
> +		sg_init_table(mq->sg, host->max_phys_segs);
>  	}
>  
>  	init_MUTEX(&mq->thread_sem);

Pierre, I can queue this up but if you merge it into your tree I shall drop
it and shall lose track of it.  So it's then all down to you to remember to
get the fix into 2.6.24.

(Except this particular bug looks like a post-2.6.23 regression, so I can cc
the Rafael which never forgets, so it will then get tracked all the way into
Linus's tree)

Re: [PATCH] mmc: Add missing sg_init_table() call

[Pierre Ossman]

On Mon, 26 Nov 2007 21:29:55 -0800
Andrew Morton <akpm@linux-foundation.org> wrote:

> 
> Pierre, I can queue this up but if you merge it into your tree I shall drop
> it and shall lose track of it.  So it's then all down to you to remember to
> get the fix into 2.6.24.
> 
> (Except this particular bug looks like a post-2.6.23 regression, so I can cc
> the Rafael which never forgets, so it will then get tracked all the way into
> Linus's tree)
> 

Jens said he applied it, so I figured the issue was handled. Jens, what happened to it?

Rgds
-- 
     -- Pierre Ossman

  Linux kernel, MMC maintainer        http://www.kernel.org
  PulseAudio, core developer          http://pulseaudio.org
  rdesktop, core developer          http://www.rdesktop.org

Re: [PATCH] mmc: Add missing sg_init_table() call

[Jens Axboe]

On Tue, Nov 27 2007, Pierre Ossman wrote:
> On Mon, 26 Nov 2007 21:29:55 -0800
> Andrew Morton <akpm@linux-foundation.org> wrote:
> 
> > 
> > Pierre, I can queue this up but if you merge it into your tree I shall drop
> > it and shall lose track of it.  So it's then all down to you to remember to
> > get the fix into 2.6.24.
> > 
> > (Except this particular bug looks like a post-2.6.23 regression, so I can cc
> > the Rafael which never forgets, so it will then get tracked all the way into
> > Linus's tree)
> > 
> 
> Jens said he applied it, so I figured the issue was handled. Jens,
> what happened to it?

It's in my for-linus branch, it was applied when I wrote that reply. So
it's going upstream, the pull request has been sent to Linus.

My error here was not updating the for-akpm branch that Andrew pulls, so
he doesn't notice the patch. That is also updated now.

-- 
Jens Axboe

Re: [PATCH] mmc: Add missing sg_init_table() call

[Rafael J. Wysocki]

On Tuesday, 27 of November 2007, Jens Axboe wrote:
> On Tue, Nov 27 2007, Pierre Ossman wrote:
> > On Mon, 26 Nov 2007 21:29:55 -0800
> > Andrew Morton <akpm@linux-foundation.org> wrote:
> > 
> > > 
> > > Pierre, I can queue this up but if you merge it into your tree I shall drop
> > > it and shall lose track of it.  So it's then all down to you to remember to
> > > get the fix into 2.6.24.
> > > 
> > > (Except this particular bug looks like a post-2.6.23 regression, so I can cc
> > > the Rafael which never forgets, so it will then get tracked all the way into
> > > Linus's tree)
> > > 
> > 
> > Jens said he applied it, so I figured the issue was handled. Jens,
> > what happened to it?
> 
> It's in my for-linus branch, it was applied when I wrote that reply. So
> it's going upstream, the pull request has been sent to Linus.
> 
> My error here was not updating the for-akpm branch that Andrew pulls, so
> he doesn't notice the patch. That is also updated now.

OK, so I'm not going to list it.

Thanks,
Rafael

Re: [PATCH] mmc: Add missing sg_init_table() call

[Haavard Skinnemoen]

On Mon, 26 Nov 2007 21:29:55 -0800
Andrew Morton <akpm@linux-foundation.org> wrote:

> On Thu, 22 Nov 2007 20:32:51 +0100 Haavard Skinnemoen <hskinnemoen@atmel.com> wrote:
> 
> > mmc_init_queue only initializes the scatterlists with sg_init_table()
> > when using a bounce buffer. This leads to a BUG() when CONFIG_DEBUG_SG
> > is set.
> >   
> 
> I assume that 2.6.23 is not afflicted in this way?

Yes, the sg_init_table() interface and CONFIG_DEBUG_SG were both added
after 2.6.23. Before that, there was no need to do anything special to
initialize a scatterlist array apart from zeroing it.

Haavard