floppy: select FDC before arming timeout work#794
Conversation
|
Upstream branch: 66edb90 |
25a041f to
6f75bd1
Compare
|
Upstream branch: 6d35786 |
a9fdbdb to
42fb4e8
Compare
6f75bd1 to
1f0d33a
Compare
|
Upstream branch: 6d35786 |
42fb4e8 to
4e2d5c3
Compare
1f0d33a to
b1870f6
Compare
|
Upstream branch: aa54b1d |
4e2d5c3 to
97004f6
Compare
b1870f6 to
ca57796
Compare
|
Upstream branch: 70eda68 |
97004f6 to
3119854
Compare
ca57796 to
c1feb59
Compare
|
Upstream branch: 8bc67e4 |
3119854 to
42c031e
Compare
c1feb59 to
ea833a1
Compare
|
Upstream branch: 6779b50 |
42c031e to
f9ba96c
Compare
ea833a1 to
7af85d1
Compare
|
Upstream branch: 79bd2dd |
f9ba96c to
bdc0f4e
Compare
7af85d1 to
de94ac7
Compare
floppy_shutdown() uses current_fdc to choose which controller state to mark for reset when fd_timeout expires. lock_fdc() currently arms that timeout before set_fdc() has selected the drive/FDC and updated current_drive/current_fdc. drive_params[drive].timeout is user configurable, so the timeout can be immediate. Even with a non-zero timeout, a delayed caller can leave the timeout work running while set_fdc() is still testing fdc_state[fdc].rawcmd and updating the adjacent reset bitfield. The timeout can then use stale selected-controller state or race the reset bitfield update. Move the timeout arm after set_fdc() in lock_fdc(), and keep the same ordering for the direct floppy_queue_rq() path. This ensures fd_timeout cannot run until the selected-controller state describes the operation being timed. Fixes: 1da177e ("Linux-2.6.12-rc2") Signed-off-by: Cen Zhang <zzzccc427@gmail.com> Reviewed-by: Denis Efremov (Oracle) <efremov@linux.com>
|
Upstream branch: eed108e |
bdc0f4e to
07d6fbc
Compare
Pull request for series with
subject: floppy: select FDC before arming timeout work
version: 1
url: https://patchwork.kernel.org/project/linux-block/list/?series=1089071