APPLIED[J] NACK[I/F]: [SRU][F][I][J][PATCH 0/6] nbd: requests can become stuck when disconnecting from server with qemu-nbd

[Matthew Ruffell]

On Sat, Jul 9, 2022 at 2:34 AM Stefan Bader <stefan.bader at canonical.com> wrote:
>
> On 22.06.22 07:17, Matthew Ruffell wrote:
> > BugLink: https://bugs.launchpad.net/bugs/1896350
> >
>
> Applied to jammy:linux/master-next. Impish will not get more updates, so
> skipped. For Focal, the set does not apply.
>
> On Focal "nbd: don't clear 'NBD_CMD_INFLIGHT' flag if request is not completed"
> fails in the last (#4) hunk. Assuming there is a backported version of that
> patch somewhere, could you submit this again for just Focal please? Thanks.
>
> -Stefan

Hi Stefan,

I checked the patches, and they apply cleanly to Focal for me. I'm using git
2.34.1 on Jammy, with Focal hash 5063db9ef77566eebd845e5016ef664268039845
(Ubuntu-5.4.0-123.139). Regardless, I will send a V2 that has been output from
format-patch from a Focal tree, instead of using the patch from the Jammy tree,
which is identical, apart from offsets.

$ git checkout -b test3 origin/master-next
Branch 'test3' set up to track remote branch 'master-next' from 'origin'.
Switched to a new branch 'test3'
matthew at desktop:~/Work/kernel/ubuntu-focal$ diff
0005-nbd-don-t-clear-NBD_CMD_INFLIGHT-flag-if-request-is-.patch
~/Work/333142/patches/0005-nbd-don-t-clear-NBD_CMD_INFLIGHT-flag-if-request-is-.patch
1c1
< From fb45ba43e36432839dacd1c27c4c1128d025fa97 Mon Sep 17 00:00:00 2001
---
> From 0c7289ffb3837a671c85c67122666ddba9154ca8 Mon Sep 17 00:00:00 2001
4c4
< Subject: [SRU][F][PATCH V2 5/6] nbd: don't clear 'NBD_CMD_INFLIGHT' flag if
---
> Subject: [SRU][F][I][J][PATCH 5/6] nbd: don't clear 'NBD_CMD_INFLIGHT' flag if
24c24
< index 01d030e9f301..6b165101f84b 100644
---
> index d525ad238e2d..f97f3a5adf28 100644
27c27
< @@ -394,13 +394,14 @@ static enum blk_eh_timer_return
nbd_xmit_timeout(struct request *req,
---
> @@ -411,13 +411,14 @@ static enum blk_eh_timer_return nbd_xmit_timeout(struct request *req,
43c43
< @@ -456,6 +457,7 @@ static enum blk_eh_timer_return
nbd_xmit_timeout(struct request *req,
---
> @@ -486,6 +487,7 @@ static enum blk_eh_timer_return nbd_xmit_timeout(struct request *req,
51c51
< @@ -715,7 +717,7 @@ static struct nbd_cmd *nbd_read_stat(struct
nbd_device *nbd, int index)
---
> @@ -745,7 +747,7 @@ static struct nbd_cmd *nbd_read_stat(struct nbd_device *nbd, int index)
60c60
< @@ -804,8 +806,16 @@ static void recv_work(struct work_struct *work)
---
> @@ -832,8 +834,16 @@ static void recv_work(struct work_struct *work)
matthew at desktop:~/Work/kernel/ubuntu-focal$ git am 000*
Patch is empty.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
matthew at desktop:~/Work/kernel/ubuntu-focal$ git am --skip
Applying: blk-mq: blk-mq: provide forced completion method
Applying: blk-mq: move failure injection out of blk_mq_complete_request
Applying: nbd: don't handle response without a corresponding request message
Applying: nbd: make sure request completion won't concurrent
Applying: nbd: don't clear 'NBD_CMD_INFLIGHT' flag if request is not completed
Applying: nbd: fix io hung while disconnecting device

Hopefully this set applies to Focal, please let me know if it does not, this
would be great to have fixed.

Thanks,
Matthew