Commit 15b81ce5 authored Jun 03, 2020 by Ahmed S. Darwish Committed by Jens Axboe Jun 04, 2020

block: nr_sects_write(): Disable preemption on seqcount write



For optimized block readers not holding a mutex, the "number of sectors"
64-bit value is protected from tearing on 32-bit architectures by a
sequence counter.

Disable preemption before entering that sequence counter's write side
critical section. Otherwise, the read side can preempt the write side
section and spin for the entire scheduler tick. If the reader belongs to
a real-time scheduling class, it can spin forever and the kernel will
livelock.

Fixes: c83f6bf9 ("block: add partition resize function to blkpg ioctl")
Cc: <stable@vger.kernel.org>
Signed-off-by: Ahmed S. Darwish <a.darwish@linutronix.de>
Reviewed-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent d24de76a

block/blk.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -420,9 +420,11 @@ static inline sector_t part_nr_sects_read(struct hd_struct *part)
		static inline void part_nr_sects_write(struct hd_struct *part, sector_t size)
		{
		#if BITS_PER_LONG==32 && defined(CONFIG_SMP)
		preempt_disable();
		write_seqcount_begin(&part->nr_sects_seq);
		part->nr_sects = size;
		write_seqcount_end(&part->nr_sects_seq);
		preempt_enable();
		#elif BITS_PER_LONG==32 && defined(CONFIG_PREEMPTION)
		preempt_disable();
		part->nr_sects = size;

Admin message