2022-09-16 11:29:11

by Yu Kuai

Subject: [PATCH v3 4/5] md/raid10: fix improper BUG_ON() in raise_barrier()

From: Yu Kuai <[email protected]>

'conf->barrier' is protected by 'conf->resync_lock', reading
'conf->barrier' without holding the lock is wrong.

Signed-off-by: Yu Kuai <[email protected]>
---
drivers/md/raid10.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index cf452c25e1e5..9a28abd19709 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -936,8 +936,8 @@ static void flush_pending_writes(struct r10conf *conf)

static void raise_barrier(struct r10conf *conf, int force)
{
- BUG_ON(force && !conf->barrier);
spin_lock_irq(&conf->resync_lock);
+ BUG_ON(force && !conf->barrier);

/* Wait until no block IO is waiting (unless 'force') */
wait_event_lock_irq(conf->wait_barrier, force || !conf->nr_waiting,
--
2.31.1

2022-09-16 18:47:03

by Logan Gunthorpe

Subject: Re: [PATCH v3 4/5] md/raid10: fix improper BUG_ON() in raise_barrier()

On 2022-09-16 05:34, Yu Kuai wrote:
> From: Yu Kuai <[email protected]>
>
> 'conf->barrier' is protected by 'conf->resync_lock', reading
> 'conf->barrier' without holding the lock is wrong.
>
> Signed-off-by: Yu Kuai <[email protected]>

Reviewed-by: Logan Gunthorpe <[email protected]>

2022-09-18 12:41:09

by Guoqing Jiang

Subject: Re: [PATCH v3 4/5] md/raid10: fix improper BUG_ON() in raise_barrier()

On 9/16/22 7:34 PM, Yu Kuai wrote:
> From: Yu Kuai <[email protected]>
>
> 'conf->barrier' is protected by 'conf->resync_lock', reading
> 'conf->barrier' without holding the lock is wrong.
>
> Signed-off-by: Yu Kuai <[email protected]>
> ---
> drivers/md/raid10.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
> index cf452c25e1e5..9a28abd19709 100644
> --- a/drivers/md/raid10.c
> +++ b/drivers/md/raid10.c
> @@ -936,8 +936,8 @@ static void flush_pending_writes(struct r10conf *conf)
>
> static void raise_barrier(struct r10conf *conf, int force)
> {
> - BUG_ON(force && !conf->barrier);
> spin_lock_irq(&conf->resync_lock);
> + BUG_ON(force && !conf->barrier);
>
> /* Wait until no block IO is waiting (unless 'force') */
> wait_event_lock_irq(conf->wait_barrier, force || !conf->nr_waiting,

Acked-by: Guoqing Jiang <[email protected]>

Thanks,
Guoqing