diff mbox series

ps3disk: Do not use dev->bounce_size before it is set

Message ID 06988f959ea6885b8bd7fb3b9059dd54bc6bbad7.1735894216.git.geert+renesas@glider.be (mailing list archive)
State New
Headers show
Series ps3disk: Do not use dev->bounce_size before it is set | expand

Commit Message

Geert Uytterhoeven Jan. 3, 2025, 8:51 a.m. UTC
dev->bounce_size is only initialized after it is used to set the queue
limits.  Fix this by using BOUNCE_SIZE instead.

Fixes: a7f18b74dbe17162 ("ps3disk: pass queue_limits to blk_mq_alloc_disk")
Reported-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Closes: https://lore.kernel.org/39256db9-3d73-4e86-a49b-300dfd670212@gmail.com
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
Guessed based on the reported bad commit ID.
Compile-tested only.
---
 drivers/block/ps3disk.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Geert Uytterhoeven Jan. 3, 2025, 9:31 a.m. UTC | #1
Hi Christoph,

On Fri, Jan 3, 2025 at 9:56 AM Christoph Hellwig <hch@lst.de> wrote:
> On Fri, Jan 03, 2025 at 09:51:25AM +0100, Geert Uytterhoeven wrote:
> > dev->bounce_size is only initialized after it is used to set the queue
> > limits.  Fix this by using BOUNCE_SIZE instead.
> >
> > Fixes: a7f18b74dbe17162 ("ps3disk: pass queue_limits to blk_mq_alloc_disk")
> > Reported-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
> > Closes: https://lore.kernel.org/39256db9-3d73-4e86-a49b-300dfd670212@gmail.com
> > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
>
> Looks fine:
>
> Reviewed-by: Christoph Hellwig <hch@lst.de>

Thanks!

> But looking at the report it seems like no one cares about ps3 upstream,
> and in fact the only person caring at all rather rants on youtube than
> helping upstream, so maybe we should just remove the ps3 support entirely?

I am a bit surprised Geoff Levand didn't catch this in his regular testing...
Hmm, looks like his last Tested-by tag predates v6.9.

Gr{oetje,eeting}s,

                        Geert
Jens Axboe Jan. 3, 2025, 6:45 p.m. UTC | #2
On Fri, 03 Jan 2025 09:51:25 +0100, Geert Uytterhoeven wrote:
> dev->bounce_size is only initialized after it is used to set the queue
> limits.  Fix this by using BOUNCE_SIZE instead.
> 
> 

Applied, thanks!

[1/1] ps3disk: Do not use dev->bounce_size before it is set
      commit: c2398e6d5f16e15598d3a37e17107fea477e3f91

Best regards,
diff mbox series

Patch

diff --git a/drivers/block/ps3disk.c b/drivers/block/ps3disk.c
index 68fed46c463e5aa9..dc9e4a14b8854587 100644
--- a/drivers/block/ps3disk.c
+++ b/drivers/block/ps3disk.c
@@ -384,9 +384,9 @@  static int ps3disk_probe(struct ps3_system_bus_device *_dev)
 	unsigned int devidx;
 	struct queue_limits lim = {
 		.logical_block_size	= dev->blk_size,
-		.max_hw_sectors		= dev->bounce_size >> 9,
+		.max_hw_sectors		= BOUNCE_SIZE >> 9,
 		.max_segments		= -1,
-		.max_segment_size	= dev->bounce_size,
+		.max_segment_size	= BOUNCE_SIZE,
 		.dma_alignment		= dev->blk_size - 1,
 		.features		= BLK_FEAT_WRITE_CACHE |
 					  BLK_FEAT_ROTATIONAL,