[GIT] floppy

[GIT] floppy

[Jiri Kosina]

Jens,

please pull from 

  git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy.git upstream

to receive 3 patches for the floppy driver. The first one fixes a number 
of races, which never exposed themselves on real floppy hardware, but are 
triggering a lot on virtualized/emulated floppy drives. The second one 
makes handling of O_EXCL on /dev/fd0 more consistent with other block 
devices (and actually fixes a userspace-visible regression). The third one 
adds myself as an unhappy maintainer, as discussed here: 
https://lkml.org/lkml/2012/5/16/370

The 'upstream' branch is based on your 'for-3.5/drivers' branch.

Thanks!

Jiri Kosina (3):
      floppy: convert to delayed work and single-thread wq
      floppy: remove floppy-specific O_EXCL handling
      floppy: take over maintainership

 MAINTAINERS            |    6 ++
 drivers/block/floppy.c |  161 +++++++++++++++++++++++-------------------------
 2 files changed, 83 insertions(+), 84 deletions(-)

-- 
Jiri Kosina
SUSE Labs

Re: [GIT] floppy

[Jens Axboe]

On 05/18/2012 03:28 PM, Jiri Kosina wrote:
> Jens,
> 
> please pull from 
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy.git upstream
> 
> to receive 3 patches for the floppy driver. The first one fixes a number 
> of races, which never exposed themselves on real floppy hardware, but are 
> triggering a lot on virtualized/emulated floppy drives. The second one 
> makes handling of O_EXCL on /dev/fd0 more consistent with other block 
> devices (and actually fixes a userspace-visible regression). The third one 
> adds myself as an unhappy maintainer, as discussed here: 
> https://lkml.org/lkml/2012/5/16/370
> 
> The 'upstream' branch is based on your 'for-3.5/drivers' branch.

Thanks Jiri, pulled in.

-- 
Jens Axboe

[GIT] floppy

[Jiri Kosina]

Jens,

please pull from

  git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy.git upstream

to receive the patch below that should go into 3.6. Thanks.

Andi Kleen (1):
      floppy: Run floppy initialization asynchronous

 drivers/block/floppy.c |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

-- 
Jiri Kosina
SUSE Labs

Re: [GIT] floppy

[Jens Axboe]

On Wed, Jul 18 2012, Jiri Kosina wrote:
> Jens,
> 
> please pull from
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy.git upstream
> 
> to receive the patch below that should go into 3.6. Thanks.
> 
> Andi Kleen (1):
>       floppy: Run floppy initialization asynchronous

Thanks, will pull it in. On vacation this week still, but back for merge
window finale at least. It's in for-3.6/drivers.

-- 
Jens Axboe

Re: [GIT] floppy

[Jiri Kosina]

On Wed, 18 Jul 2012, Jiri Kosina wrote:

> please pull from
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy.git upstream
> 
> to receive the patch below that should go into 3.6. Thanks.
> 
> Andi Kleen (1):
>       floppy: Run floppy initialization asynchronous
> 
>  drivers/block/floppy.c |   21 ++++++++++++++++++++-
>  1 files changed, 20 insertions(+), 1 deletions(-)

Jens,

as you haven't seem to have pulled yet, I am sending an updated request 
with minor cleanup from Fengguang.

Please pull from

  git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy.git upstream

to receive the floppy patches below.

Andi Kleen (1):
      floppy: Run floppy initialization asynchronous

Fengguang Wu (1):
      floppy: remove duplicated flag FD_RAW_NEED_DISK

 drivers/block/floppy.c |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

Thanks!

-- 
Jiri Kosina
SUSE Labs

Re: [GIT] floppy

[Jens Axboe]

On 07/31/2012 11:46 AM, Jiri Kosina wrote:
> On Wed, 18 Jul 2012, Jiri Kosina wrote:
> 
>> please pull from
>>
>>   git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy.git upstream
>>
>> to receive the patch below that should go into 3.6. Thanks.
>>
>> Andi Kleen (1):
>>       floppy: Run floppy initialization asynchronous
>>
>>  drivers/block/floppy.c |   21 ++++++++++++++++++++-
>>  1 files changed, 20 insertions(+), 1 deletions(-)
> 
> Jens,
> 
> as you haven't seem to have pulled yet, I am sending an updated request 
> with minor cleanup from Fengguang.
> 
> Please pull from
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy.git upstream
> 
> to receive the floppy patches below.
> 
> Andi Kleen (1):
>       floppy: Run floppy initialization asynchronous
> 
> Fengguang Wu (1):
>       floppy: remove duplicated flag FD_RAW_NEED_DISK

I have pulled, it's in my for-3.6/drivers branch since I sent my reply.
Updated now with Wu's patch too.

-- 
Jens Axboe

[GIT] floppy

[Jiri Kosina]

Jens,

please pull from

  git://git.kernel.org/pub/scm/linux/kernel/git/jikos/linux-block.git for-jens

into your for-3.7/drivers branch to receive revert of patch that Sasha 
Levin reported to cause NULL pointer dereferences, and it's not necessary.

Thanks!

Jiri Kosina (1):
      Revert "genhd: Make put_disk() safe for disks that have not been registered"

 block/genhd.c          |    6 +++---
 drivers/block/floppy.c |   13 +++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

-- 
Jiri Kosina
SUSE Labs

[GIT] floppy

[Jiri Kosina]

Jens,

please pull from

  git://git.kernel.org/pub/scm/linux/kernel/git/jikos/linux-block.git floppy

to receive fix for race between destroying of floppy workqueue and block 
queue. Thanks!


[ This is based on your 'for-3.7/drivers' branch; it should still be 
  pushed to Linus for 3.7 still ]

Jiri Kosina (1):
      floppy: destroy floppy workqueue before cleaning up the queue

 drivers/block/floppy.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

-- 
Jiri Kosina
SUSE Labs

Re: [GIT] floppy

[Jens Axboe]

On 2012-11-06 12:10, Jiri Kosina wrote:
> Jens,
> 
> please pull from
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/jikos/linux-block.git floppy
> 
> to receive fix for race between destroying of floppy workqueue and block 
> queue. Thanks!
> 
> 
> [ This is based on your 'for-3.7/drivers' branch; it should still be 
>   pushed to Linus for 3.7 still ]
> 
> Jiri Kosina (1):
>       floppy: destroy floppy workqueue before cleaning up the queue
> 
>  drivers/block/floppy.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)

Can you either just send me the patch, or base it against master? After
the merge window, trees should be based off for-linus (if it exists) or
just Linus master.

For this one, I'll just grab the patch, from the email thread :-)

-- 
Jens Axboe

Re: [GIT] floppy

[Jiri Kosina]

On Tue, 6 Nov 2012, Jens Axboe wrote:

> > Jiri Kosina (1):
> >       floppy: destroy floppy workqueue before cleaning up the queue
> > 
> >  drivers/block/floppy.c |    5 +++--
> >  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> Can you either just send me the patch, or base it against master? After
> the merge window, trees should be based off for-linus (if it exists) or
> just Linus master.

OK, noted you'd like this workflow for future pull requests.

> For this one, I'll just grab the patch, from the email thread :-)

Please apply the one below then. It contains proper changelog and also the 
corresponding module unload fix as well. Thanks.






From: Jiri Kosina <jkosina@suse.cz>
Subject: [PATCH] floppy: destroy floppy workqueue before cleaning up the queue

We need to first destroy the floppy_wq workqueue before cleaning up
the queue. Otherwise we might race with still pending work with the
workqueue, but all the block queue already gone. This might lead to
various oopses, such as

 CPU 0
 Pid: 6, comm: kworker/u:0 Not tainted 3.7.0-rc4 #1 Bochs Bochs
 RIP: 0010:[<ffffffff8134eef5>]  [<ffffffff8134eef5>] blk_peek_request+0xd5/0x1c0
 RSP: 0000:ffff88000dc7dd88  EFLAGS: 00010092
 RAX: 0000000000000001 RBX: 0000000000000000 RCX: 0000000000000000
 RDX: ffff88000f602688 RSI: ffffffff81fd95d8 RDI: 6b6b6b6b6b6b6b6b
 RBP: ffff88000dc7dd98 R08: ffffffff81fd95c8 R09: 0000000000000000
 R10: ffffffff81fd9480 R11: 0000000000000001 R12: 6b6b6b6b6b6b6b6b
 R13: ffff88000dc7dfd8 R14: ffff88000dc7dfd8 R15: 0000000000000000
 FS:  0000000000000000(0000) GS:ffffffff81e21000(0000) knlGS:0000000000000000
 CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
 CR2: 0000000000000000 CR3: 0000000001e11000 CR4: 00000000000006f0
 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
 Process kworker/u:0 (pid: 6, threadinfo ffff88000dc7c000, task ffff88000dc5ecc0)
 Stack:
  0000000000000000 0000000000000000 ffff88000dc7ddb8 ffffffff8134efee
  ffff88000dc7ddb8 0000000000000000 ffff88000dc7dde8 ffffffff814aef3c
  ffffffff81e75d80 ffff88000dc0c640 ffff88000fbfb000 ffffffff814aed90
 Call Trace:
  [<ffffffff8134efee>] blk_fetch_request+0xe/0x30
  [<ffffffff814aef3c>] redo_fd_request+0x1ac/0x400
  [<ffffffff814aed90>] ? start_motor+0x130/0x130
  [<ffffffff8106b526>] process_one_work+0x136/0x450
  [<ffffffff8106af65>] ? manage_workers+0x205/0x2e0
  [<ffffffff8106bb6d>] worker_thread+0x14d/0x420
  [<ffffffff8106ba20>] ? rescuer_thread+0x1a0/0x1a0
  [<ffffffff8107075a>] kthread+0xba/0xc0
  [<ffffffff810706a0>] ? __kthread_parkme+0x80/0x80
  [<ffffffff818b553a>] ret_from_fork+0x7a/0xb0
  [<ffffffff810706a0>] ? __kthread_parkme+0x80/0x80
 Code: 0f 84 c0 00 00 00 83 f8 01 0f 85 e2 00 00 00 81 4b 40 00 00 80 00 48 89 df e8 58 f8 ff ff be fb ff ff ff
 fe ff ff <49> 8b 1c 24 49 39 dc 0f 85 2e ff ff ff 41 0f b6 84 24 28 04 00
 RIP  [<ffffffff8134eef5>] blk_peek_request+0xd5/0x1c0
  RSP <ffff88000dc7dd88>

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Tested-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
---
 drivers/block/floppy.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 9d900e6..51f0c3d 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4331,6 +4331,7 @@ out_unreg_region:
 out_unreg_blkdev:
 	unregister_blkdev(FLOPPY_MAJOR, "fd");
 out_put_disk:
+	destroy_workqueue(floppy_wq);
 	for (drive = 0; drive < N_DRIVE; drive++) {
 		if (!disks[drive])
 			break;
@@ -4345,7 +4346,6 @@ out_put_disk:
 		}
 		put_disk(disks[drive]);
 	}
-	destroy_workqueue(floppy_wq);
 	return err;
 }
 
@@ -4560,6 +4560,8 @@ static void __exit floppy_module_exit(void)
 	unregister_blkdev(FLOPPY_MAJOR, "fd");
 	platform_driver_unregister(&floppy_driver);
 
+	destroy_workqueue(floppy_wq);
+
 	for (drive = 0; drive < N_DRIVE; drive++) {
 		del_timer_sync(&motor_off_timer[drive]);
 
@@ -4583,7 +4585,6 @@ static void __exit floppy_module_exit(void)
 
 	cancel_delayed_work_sync(&fd_timeout);
 	cancel_delayed_work_sync(&fd_timer);
-	destroy_workqueue(floppy_wq);
 
 	if (atomic_read(&usage_count))
 		floppy_release_irq_and_dma();

-- 
Jiri Kosina
SUSE Labs

Re: [GIT] floppy

[Jens Axboe]

On 2012-11-06 12:17, Jiri Kosina wrote:
> On Tue, 6 Nov 2012, Jens Axboe wrote:
> 
>>> Jiri Kosina (1):
>>>       floppy: destroy floppy workqueue before cleaning up the queue
>>>
>>>  drivers/block/floppy.c |    5 +++--
>>>  1 files changed, 3 insertions(+), 2 deletions(-)
>>
>> Can you either just send me the patch, or base it against master? After
>> the merge window, trees should be based off for-linus (if it exists) or
>> just Linus master.
> 
> OK, noted you'd like this workflow for future pull requests.
> 
>> For this one, I'll just grab the patch, from the email thread :-)
> 
> Please apply the one below then. It contains proper changelog and also the 
> corresponding module unload fix as well. Thanks.

I did grab that one:

http://git.kernel.dk/?p=linux-block.git;a=commit;h=baf92d83c7747f3114cd21f63930004fc03e8365

-- 
Jens Axboe

Re: [GIT] floppy

[Jiri Kosina]

On Tue, 6 Nov 2012, Jens Axboe wrote:

> >>> Jiri Kosina (1):
> >>>       floppy: destroy floppy workqueue before cleaning up the queue
> >>>
> >>>  drivers/block/floppy.c |    5 +++--
> >>>  1 files changed, 3 insertions(+), 2 deletions(-)
> >>
> >> Can you either just send me the patch, or base it against master? After
> >> the merge window, trees should be based off for-linus (if it exists) or
> >> just Linus master.
> > 
> > OK, noted you'd like this workflow for future pull requests.
> > 
> >> For this one, I'll just grab the patch, from the email thread :-)
> > 
> > Please apply the one below then. It contains proper changelog and also the 
> > corresponding module unload fix as well. Thanks.
> 
> I did grab that one:
> 
> http://git.kernel.dk/?p=linux-block.git;a=commit;h=baf92d83c7747f3114cd21f63930004fc03e8365

Excellent, that's the proper one. Thanks.

-- 
Jiri Kosina
SUSE Labs

Re: [GIT] floppy

[Sasha Levin]

Hi guys!

This is me complaining that I still see the spews that this pull
request should fix, probably because this mail got lost.


Thanks,
Sasha

On Fri, Oct 26, 2012 at 3:15 PM, Jiri Kosina <jkosina@suse.cz> wrote:
> Jens,
>
> please pull from
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/jikos/linux-block.git for-jens
>
> into your for-3.7/drivers branch to receive revert of patch that Sasha
> Levin reported to cause NULL pointer dereferences, and it's not necessary.
>
> Thanks!
>
> Jiri Kosina (1):
>       Revert "genhd: Make put_disk() safe for disks that have not been registered"
>
>  block/genhd.c          |    6 +++---
>  drivers/block/floppy.c |   13 +++++++++++++
>  2 files changed, 16 insertions(+), 3 deletions(-)
>
> --
> Jiri Kosina
> SUSE Labs
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT] floppy

[Jiri Kosina]

On Wed, 7 Nov 2012, Sasha Levin wrote:

> Hi guys!
> 
> This is me complaining that I still see the spews that this pull
> request should fix, probably because this mail got lost.

You are seeing that on -next, right?

That's because a different version of the patchset has been pushed to 
Linus, but for-next branch in Jens' tree still contains the old patchset 
containing the faulty patch (which is never going upstream).

The fixed series is now in Linus' tree (as per -rc4), and I guess you are 
not having the problem there, right?

Thanks,

-- 
Jiri Kosina
SUSE Labs

Re: [GIT] floppy

[Sasha Levin]

On Wed, Nov 7, 2012 at 3:48 PM, Jiri Kosina <jkosina@suse.cz> wrote:
> On Wed, 7 Nov 2012, Sasha Levin wrote:
>
>> Hi guys!
>>
>> This is me complaining that I still see the spews that this pull
>> request should fix, probably because this mail got lost.
>
> You are seeing that on -next, right?

Yup.

> That's because a different version of the patchset has been pushed to
> Linus, but for-next branch in Jens' tree still contains the old patchset
> containing the faulty patch (which is never going upstream).
>
> The fixed series is now in Linus' tree (as per -rc4), and I guess you are
> not having the problem there, right?

I haven't thought of trying just Linus's tree because I thought that
the original patch
that causes the breakage didn't make it there, so it would be obvious
that it would
work fine.

I'll give it a go I guess.


Thanks,
Sasha

[GIT] floppy

[Jiri Kosina]

Jens,

please consider pulling

  git://git.kernel.org/pub/scm/linux/kernel/git/jikos/linux-block.git for-jens

into your for-3.14/drivers branch to receive

Jiri Kosina (1):
      floppy: bail out in open() if drive is not responding to block0 read

 drivers/block/floppy.c  |   36 +++++++++++++++++++++++++++---------
 include/uapi/linux/fd.h |    3 ++-
 2 files changed, 29 insertions(+), 10 deletions(-)

Thanks!

-- 
Jiri Kosina
SUSE Labs

Re: [GIT] floppy

[Jens Axboe]

On Fri, Jan 17 2014, Jiri Kosina wrote:
> Jens,
> 
> please consider pulling
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/jikos/linux-block.git for-jens
> 
> into your for-3.14/drivers branch to receive
> 
> Jiri Kosina (1):
>       floppy: bail out in open() if drive is not responding to block0 read

Thanks Jiri, pulled.

-- 
Jens Axboe