From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org
Cc: Jared Holzman <jholzman@nvidia.com>, Sasha Levin <sashal@kernel.org>
Subject: Re: [PATCH 6.14.y v2 3/7] ublk: move device reset into ublk_ch_release()
Date: Thu, 8 May 2025 12:19:34 -0400 [thread overview]
Message-ID: <20250507084139-5291449c12f8b77e@stable.kernel.org> (raw)
In-Reply-To: <20250507094702.73459-4-jholzman@nvidia.com>
[ Sasha's backport helper bot ]
Hi,
✅ All tests passed successfully. No issues detected.
No action required from the submitter.
The upstream commit SHA1 provided is correct: 728cbac5fe219d3b8a21a0688a08f2b7f8aeda2b
WARNING: Author mismatch between patch and upstream commit:
Backport author: Jared Holzman<jholzman@nvidia.com>
Commit author: Ming Lei<ming.lei@redhat.com>
Note: The patch differs from the upstream commit:
---
1: 728cbac5fe219 ! 1: 24577a96fbb85 ublk: move device reset into ublk_ch_release()
@@ Metadata
## Commit message ##
ublk: move device reset into ublk_ch_release()
+ [ Upstream commit 728cbac5fe219d3b8a21a0688a08f2b7f8aeda2b ]
+
ublk_ch_release() is called after ublk char device is closed, when all
uring_cmd are done, so it is perfect fine to move ublk device reset to
ublk_ch_release() from ublk_ctrl_start_recovery().
@@ drivers/block/ublk_drv.c: static void ublk_mark_io_ready(struct ublk_device *ub,
+ }
}
- static void ublk_handle_need_get_data(struct ublk_device *ub, int q_id,
+ static inline int ublk_check_cmd_op(u32 cmd_op)
@@ drivers/block/ublk_drv.c: static int ublk_ctrl_set_params(struct ublk_device *ub,
return ret;
}
@@ drivers/block/ublk_drv.c: static int ublk_ctrl_set_params(struct ublk_device *ub
-}
-
static int ublk_ctrl_start_recovery(struct ublk_device *ub,
- const struct ublksrv_ctrl_cmd *header)
+ struct io_uring_cmd *cmd)
{
+ const struct ublksrv_ctrl_cmd *header = io_uring_sqe_cmd(cmd->sqe);
int ret = -EINVAL;
- int i;
@@ drivers/block/ublk_drv.c: static int ublk_ctrl_start_recovery(struct ublk_device
ret = 0;
out_unlock:
@@ drivers/block/ublk_drv.c: static int ublk_ctrl_end_recovery(struct ublk_device *ub,
- {
+ const struct ublksrv_ctrl_cmd *header = io_uring_sqe_cmd(cmd->sqe);
int ublksrv_pid = (int)header->data[0];
int ret = -EINVAL;
- int i;
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-5.4.y | Success | Success |
next prev parent reply other threads:[~2025-05-08 16:19 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-07 9:46 [PATCH 6.14.y v2 0/7] ublk: fix race between io_uring_cmd_complete_in_task and ublk_cancel_cmd Jared Holzman
2025-05-07 9:46 ` [PATCH 6.14.y v2 1/7] ublk: add helper of ublk_need_map_io() Jared Holzman
2025-05-08 16:17 ` Sasha Levin
2025-05-07 9:46 ` [PATCH 6.14.y v2 2/7] ublk: properly serialize all FETCH_REQs Jared Holzman
2025-05-08 16:18 ` Sasha Levin
2025-05-07 9:46 ` [PATCH 6.14.y v2 3/7] ublk: move device reset into ublk_ch_release() Jared Holzman
2025-05-08 16:19 ` Sasha Levin [this message]
2025-05-07 9:46 ` [PATCH 6.14.y v2 4/7] ublk: improve detection and handling of ublk server exit Jared Holzman
2025-05-08 16:19 ` Sasha Levin
2025-05-07 9:47 ` [PATCH 6.14.y v2 5/7] ublk: remove __ublk_quiesce_dev() Jared Holzman
2025-05-08 16:17 ` Sasha Levin
2025-05-07 9:47 ` [PATCH 6.14.y v2 6/7] ublk: simplify aborting ublk request Jared Holzman
2025-05-08 16:18 ` Sasha Levin
2025-05-07 9:47 ` [PATCH 6.14.y v2 7/7] ublk: fix race between io_uring_cmd_complete_in_task and ublk_cancel_cmd Jared Holzman
2025-05-08 16:17 ` Sasha Levin
2025-05-07 11:18 ` [PATCH 6.14.y v2 0/7] " Ming Lei
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250507084139-5291449c12f8b77e@stable.kernel.org \
--to=sashal@kernel.org \
--cc=jholzman@nvidia.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox