public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed
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 2/7] ublk: properly serialize all FETCH_REQs
Date: Thu,  8 May 2025 12:18:10 -0400	[thread overview]
Message-ID: <20250507083857-64fffb6941388e98@stable.kernel.org> (raw)
In-Reply-To: <20250507094702.73459-3-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: b69b8edfb27dfa563cd53f590ec42b481f9eb174

WARNING: Author mismatch between patch and upstream commit:
Backport author: Jared Holzman<jholzman@nvidia.com>
Commit author: Uday Shankar<ushankar@purestorage.com>

Note: The patch differs from the upstream commit:
---
1:  b69b8edfb27df ! 1:  632ba3dbe853d ublk: properly serialize all FETCH_REQs
    @@ Metadata
      ## Commit message ##
         ublk: properly serialize all FETCH_REQs
     
    +    [ Upstream commit b69b8edfb27dfa563cd53f590ec42b481f9eb174 ]
    +
         Most uring_cmds issued against ublk character devices are serialized
         because each command affects only one queue, and there is an early check
         which only allows a single task (the queue's ubq_daemon) to issue
    @@ drivers/block/ublk_drv.c: static void ublk_mark_io_ready(struct ublk_device *ub,
     -	mutex_unlock(&ub->mutex);
      }
      
    - static void ublk_handle_need_get_data(struct ublk_device *ub, int q_id,
    -@@ drivers/block/ublk_drv.c: static int ublk_unregister_io_buf(struct io_uring_cmd *cmd,
    - 	return io_buffer_unregister_bvec(cmd, index, issue_flags);
    + static inline int ublk_check_cmd_op(u32 cmd_op)
    +@@ drivers/block/ublk_drv.c: static inline void ublk_prep_cancel(struct io_uring_cmd *cmd,
    + 	io_uring_cmd_mark_cancelable(cmd, issue_flags);
      }
      
     +static int ublk_fetch(struct io_uring_cmd *cmd, struct ublk_queue *ubq,
    @@ drivers/block/ublk_drv.c: static int ublk_unregister_io_buf(struct io_uring_cmd
      			       unsigned int issue_flags,
      			       const struct ublksrv_io_cmd *ub_cmd)
     @@ drivers/block/ublk_drv.c: static int __ublk_ch_uring_cmd(struct io_uring_cmd *cmd,
    - 	case UBLK_IO_UNREGISTER_IO_BUF:
    - 		return ublk_unregister_io_buf(cmd, ub_cmd->addr, issue_flags);
    + 	ret = -EINVAL;
    + 	switch (_IOC_NR(cmd_op)) {
      	case UBLK_IO_FETCH_REQ:
     -		/* UBLK_IO_FETCH_REQ is only allowed before queue is setup */
     -		if (ublk_queue_ready(ubq)) {
---

Results of testing on various branches:

| Branch                    | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-5.4.y        |  Success    |  Success   |

  reply	other threads:[~2025-05-08 16:18 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 [this message]
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
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=20250507083857-64fffb6941388e98@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