From patchwork Wed Apr 16 19:46:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uday Shankar X-Patchwork-Id: 14054439 Received: from mail-yw1-f225.google.com (mail-yw1-f225.google.com [209.85.128.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B7F95224B1A for ; Wed, 16 Apr 2025 19:46:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.225 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744832781; cv=none; b=InS1vevdu6hiVvb81mS1n2qSaYP79uvIREvUGdkV6IWmsACJLpz3wC1AOUSwuCDM9wNgRc5MKa0EPbKKNujDFihibyQavhUDREqGgaOIUwQxPClTU3sw1BgFQa0puDbly1afbTpcJWgqLRSPJlIFERYxJIOAi8C+bunooWdQKbw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744832781; c=relaxed/simple; bh=tYWKo49qWwobGHivnVbrXRT7o/0NtMaP2FGGsVhHUk0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BpjdMSB5AbycO2IvXDK91qyxs400BqE7hUrbm1MXaaDnftie6/HHj237jUaHZPf7tF0AqHyiQBSqpnVyGZAdBM9q8KaQiu3jAffAWCVbKuIzyFXqt3i6aHvigNrznRSX7rxs1Lcp3WbWCxsdkYcZ1OjiKmpJQ1FP+LZeX2cwtXw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=P9cxdZWM; arc=none smtp.client-ip=209.85.128.225 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="P9cxdZWM" Received: by mail-yw1-f225.google.com with SMTP id 00721157ae682-6f768e9be1aso12534957b3.0 for ; Wed, 16 Apr 2025 12:46:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1744832777; x=1745437577; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=OofhF9O27cVrb8WKj94QBUeimdnvDakh4zV4gN59Auk=; b=P9cxdZWMqrsCEMoQNaOHOiknddPAA1vvdcpLEjhLd4R83CD+6hgWg7dH8XJTTW13mY 2d/fnmrqKEnjH9bwhSKDQFfPhRq3lQ0sIHwNWw5nTDiNpjk9/IPttXKXJoh6CNaH8tDW F/eutFH7mAhqNETC+Wbs867u+qQXTINblJue93iVWnzsYjkAaHcODWwNYS6LzhSB0t1v QVRj0nM1brG95gwRkyLKM8egeDf/5+VPmf+QsQ8mJeO8voGhDL1r3gfEKIUfSVCM2udF 4m7ukMr/e48tUWIXxUelwf/H1jMSxRHOAPbdKT8UVlTdr51y1sYNOz0z0e3//iT2LnhD SlvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744832777; x=1745437577; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OofhF9O27cVrb8WKj94QBUeimdnvDakh4zV4gN59Auk=; b=llH5Svv/ly5T7xLdEgXlv/WCF/vp08Q7wykLRq4S24b1v76FUXgk1LrsAiEl+SzMzu P/0pn8F5BmwXbG3XZ19gMndGRyX6x9WFAzz13RFMMoSduP5gFFsWc7vwIRRsmwebnQjE va2zIcwsajsqFUXIpU4mEUKCEp6RusUfpbuNF5VLUC20mXhBjXcnNWj0UPPnjcOsXsFv cAwWoyA6IKXgxF1B63+9yTCZXcstn8i6TGQe1R1cNBb9WgmxtI5VcKZmSr3lcdVQdIJW eITkTdoemLmz+SghyOxk/Woc2a08BTdjDM1immrj62dKEH6VUKDon4gHXyw+hfpRvHD7 sRsg== X-Gm-Message-State: AOJu0YwiQnaZKDMYF4JENNX5WdEAp1K0oqpp1KtozPdHyZPRQNdrpKDj kzqLQBdzOFv1ALD+aOXSsPnG7qkkrpmCyk5FRt09c5VP6r2CEtQs1bKh4B0mJ2nWhOvHxVCyaZ8 UL1HfHBTl3fEEUxfT4JHSXEpvTGQcmwBA X-Gm-Gg: ASbGncsgbFJ8LkE8sA3ga5LFCbiYK+FWuahRt9fHCE5Z/DcJ8UCeFiB1jSL8NX2QGIM KIii9xghRgqZ6NeTVP+lFBuVFCM0snTlOqFR4FAZaqkjvErrit/WF3XaykOrugr5FfErE+GxZJS c2bu/OatvzBs09rqCM9DGUvbE2d0H3YaI3ReNQjYZ6XF4MOtVPRbhO5wHsXVqgD4bkfhvjOFXqf 56/zfOR3mkvpSjdDcE76v3OP7SFbxYhlXTVzuNIbtm3R885Jp11/3wdMBcKon7GtDEsXCz2iSUB qkgfWXnoQr2MRWWNQbrSo/J4nnYNmFEM84gmUoNQO4u20Q== X-Google-Smtp-Source: AGHT+IHK6kJ+1KjaTnTQVEhaL8MlXYaxdyW3jy6ShqO7QymT3Ojn4Obrefs2o7lpRfVUMFUZ8u7oSSQml4nx X-Received: by 2002:a05:690c:3393:b0:6f9:4c00:53ae with SMTP id 00721157ae682-706beb2df29mr1335057b3.8.1744832777325; Wed, 16 Apr 2025 12:46:17 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([208.88.159.128]) by smtp-relay.gmail.com with ESMTPS id 00721157ae682-7053e0f43b6sm7203417b3.11.2025.04.16.12.46.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Apr 2025 12:46:17 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-ushankar.dev.purestorage.com (dev-ushankar.dev.purestorage.com [10.7.70.36]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id 8D61C340424; Wed, 16 Apr 2025 13:46:16 -0600 (MDT) Received: by dev-ushankar.dev.purestorage.com (Postfix, from userid 1557716368) id 81E3FE402BD; Wed, 16 Apr 2025 13:46:16 -0600 (MDT) From: Uday Shankar Date: Wed, 16 Apr 2025 13:46:05 -0600 Subject: [PATCH v5 1/4] ublk: require unique task per io instead of unique task per hctx Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250416-ublk_task_per_io-v5-1-9261ad7bff20@purestorage.com> References: <20250416-ublk_task_per_io-v5-0-9261ad7bff20@purestorage.com> In-Reply-To: <20250416-ublk_task_per_io-v5-0-9261ad7bff20@purestorage.com> To: Ming Lei , Jens Axboe , Caleb Sander Mateos Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Uday Shankar X-Mailer: b4 0.14.2 Currently, ublk_drv associates to each hardware queue (hctx) a unique task (called the queue's ubq_daemon) which is allowed to issue COMMIT_AND_FETCH commands against the hctx. If any other task attempts to do so, the command fails immediately with EINVAL. When considered together with the block layer architecture, the result is that for each CPU C on the system, there is a unique ublk server thread which is allowed to handle I/O submitted on CPU C. This can lead to suboptimal performance under imbalanced load generation. For an extreme example, suppose all the load is generated on CPUs mapping to a single ublk server thread. Then that thread may be fully utilized and become the bottleneck in the system, while other ublk server threads are totally idle. This issue can also be addressed directly in the ublk server without kernel support by having threads dequeue I/Os and pass them around to ensure even load. But this solution requires inter-thread communication at least twice for each I/O (submission and completion), which is generally a bad pattern for performance. The problem gets even worse with zero copy, as more inter-thread communication would be required to have the buffer register/unregister calls to come from the correct thread. Therefore, address this issue in ublk_drv by requiring a unique task per I/O instead of per queue/hctx. Imbalanced load can then be balanced across all ublk server threads by having threads issue FETCH_REQs in a round-robin manner. As a small toy example, consider a system with a single ublk device having 2 queues, each of queue depth 4. A ublk server having 4 threads could issue its FETCH_REQs against this device as follows (where each entry is the qid,tag pair that the FETCH_REQ targets): poller thread: T0 T1 T2 T3 0,0 0,1 0,2 0,3 1,3 1,0 1,1 1,2 Since tags appear to be allocated in sequential chunks, this setup provides a rough approximation to distributing I/Os round-robin across all ublk server threads, while letting I/Os stay fully thread-local. Signed-off-by: Uday Shankar Reviewed-by: Caleb Sander Mateos --- drivers/block/ublk_drv.c | 76 ++++++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 41 deletions(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index cdb1543fa4a9817aa2ca2fca66720f589cf222be..4e4863d873e6593ad94c72cbf971f792df5795ae 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -150,6 +150,7 @@ struct ublk_io { int res; struct io_uring_cmd *cmd; + struct task_struct *task; }; struct ublk_queue { @@ -157,11 +158,9 @@ struct ublk_queue { int q_depth; unsigned long flags; - struct task_struct *ubq_daemon; struct ublksrv_io_desc *io_cmd_buf; bool force_abort; - bool timeout; bool canceling; bool fail_io; /* copy of dev->state == UBLK_S_DEV_FAIL_IO */ unsigned short nr_io_ready; /* how many ios setup */ @@ -1072,11 +1071,6 @@ static inline struct ublk_uring_cmd_pdu *ublk_get_uring_cmd_pdu( return io_uring_cmd_to_pdu(ioucmd, struct ublk_uring_cmd_pdu); } -static inline bool ubq_daemon_is_dying(struct ublk_queue *ubq) -{ - return ubq->ubq_daemon->flags & PF_EXITING; -} - /* todo: handle partial completion */ static inline void __ublk_complete_rq(struct request *req) { @@ -1224,13 +1218,13 @@ static void ublk_dispatch_req(struct ublk_queue *ubq, /* * Task is exiting if either: * - * (1) current != ubq_daemon. + * (1) current != io->task. * io_uring_cmd_complete_in_task() tries to run task_work - * in a workqueue if ubq_daemon(cmd's task) is PF_EXITING. + * in a workqueue if cmd's task is PF_EXITING. * * (2) current->flags & PF_EXITING. */ - if (unlikely(current != ubq->ubq_daemon || current->flags & PF_EXITING)) { + if (unlikely(current != io->task || current->flags & PF_EXITING)) { __ublk_abort_rq(ubq, req); return; } @@ -1336,23 +1330,20 @@ static void ublk_queue_cmd_list(struct ublk_queue *ubq, struct rq_list *l) static enum blk_eh_timer_return ublk_timeout(struct request *rq) { struct ublk_queue *ubq = rq->mq_hctx->driver_data; + struct ublk_io *io = &ubq->ios[rq->tag]; unsigned int nr_inflight = 0; int i; if (ubq->flags & UBLK_F_UNPRIVILEGED_DEV) { - if (!ubq->timeout) { - send_sig(SIGKILL, ubq->ubq_daemon, 0); - ubq->timeout = true; - } - + send_sig(SIGKILL, io->task, 0); return BLK_EH_DONE; } - if (!ubq_daemon_is_dying(ubq)) + if (!(io->task->flags & PF_EXITING)) return BLK_EH_RESET_TIMER; for (i = 0; i < ubq->q_depth; i++) { - struct ublk_io *io = &ubq->ios[i]; + io = &ubq->ios[i]; if (!(io->flags & UBLK_IO_FLAG_ACTIVE)) nr_inflight++; @@ -1552,8 +1543,8 @@ static void ublk_commit_completion(struct ublk_device *ub, } /* - * Called from ubq_daemon context via cancel fn, meantime quiesce ublk - * blk-mq queue, so we are called exclusively with blk-mq and ubq_daemon + * Called from io task context via cancel fn, meantime quiesce ublk + * blk-mq queue, so we are called exclusively with blk-mq and io task * context, so everything is serialized. */ static void ublk_abort_queue(struct ublk_device *ub, struct ublk_queue *ubq) @@ -1669,13 +1660,13 @@ static void ublk_uring_cmd_cancel_fn(struct io_uring_cmd *cmd, return; task = io_uring_cmd_get_task(cmd); - if (WARN_ON_ONCE(task && task != ubq->ubq_daemon)) + io = &ubq->ios[pdu->tag]; + if (WARN_ON_ONCE(task && task != io->task)) return; ub = ubq->dev; need_schedule = ublk_abort_requests(ub, ubq); - io = &ubq->ios[pdu->tag]; WARN_ON_ONCE(io->cmd != cmd); ublk_cancel_cmd(ubq, io, issue_flags); @@ -1836,8 +1827,6 @@ static void ublk_mark_io_ready(struct ublk_device *ub, struct ublk_queue *ubq) mutex_lock(&ub->mutex); ubq->nr_io_ready++; if (ublk_queue_ready(ubq)) { - ubq->ubq_daemon = current; - get_task_struct(ubq->ubq_daemon); ub->nr_queues_ready++; if (capable(CAP_SYS_ADMIN)) @@ -1934,6 +1923,7 @@ static int __ublk_ch_uring_cmd(struct io_uring_cmd *cmd, const struct ublksrv_io_cmd *ub_cmd) { struct ublk_device *ub = cmd->file->private_data; + struct task_struct *task; struct ublk_queue *ubq; struct ublk_io *io; u32 cmd_op = cmd->cmd_op; @@ -1952,13 +1942,13 @@ static int __ublk_ch_uring_cmd(struct io_uring_cmd *cmd, if (!ubq || ub_cmd->q_id != ubq->q_id) goto out; - if (ubq->ubq_daemon && ubq->ubq_daemon != current) - goto out; - if (tag >= ubq->q_depth) goto out; io = &ubq->ios[tag]; + task = READ_ONCE(io->task); + if (task && task != current) + goto out; /* there is pending io cmd, something must be wrong */ if (io->flags & UBLK_IO_FLAG_ACTIVE) { @@ -2011,6 +2001,7 @@ static int __ublk_ch_uring_cmd(struct io_uring_cmd *cmd, } ublk_fill_io_cmd(io, cmd, ub_cmd->addr); + WRITE_ONCE(io->task, get_task_struct(current)); ublk_mark_io_ready(ub, ubq); break; case UBLK_IO_COMMIT_AND_FETCH_REQ: @@ -2248,9 +2239,15 @@ static void ublk_deinit_queue(struct ublk_device *ub, int q_id) { int size = ublk_queue_cmd_buf_size(ub, q_id); struct ublk_queue *ubq = ublk_get_queue(ub, q_id); + struct ublk_io *io; + int i; + + for (i = 0; i < ubq->q_depth; i++) { + io = &ubq->ios[i]; + if (io->task) + put_task_struct(io->task); + } - if (ubq->ubq_daemon) - put_task_struct(ubq->ubq_daemon); if (ubq->io_cmd_buf) free_pages((unsigned long)ubq->io_cmd_buf, get_order(size)); } @@ -2936,15 +2933,8 @@ static void ublk_queue_reinit(struct ublk_device *ub, struct ublk_queue *ubq) { int i; - WARN_ON_ONCE(!(ubq->ubq_daemon && ubq_daemon_is_dying(ubq))); - /* All old ioucmds have to be completed */ ubq->nr_io_ready = 0; - /* old daemon is PF_EXITING, put it now */ - put_task_struct(ubq->ubq_daemon); - /* We have to reset it to NULL, otherwise ub won't accept new FETCH_REQ */ - ubq->ubq_daemon = NULL; - ubq->timeout = false; ubq->canceling = false; for (i = 0; i < ubq->q_depth; i++) { @@ -2954,6 +2944,10 @@ static void ublk_queue_reinit(struct ublk_device *ub, struct ublk_queue *ubq) io->flags = 0; io->cmd = NULL; io->addr = 0; + + WARN_ON_ONCE(!(io->task && (io->task->flags & PF_EXITING))); + put_task_struct(io->task); + io->task = NULL; } } @@ -2993,7 +2987,7 @@ static int ublk_ctrl_start_recovery(struct ublk_device *ub, pr_devel("%s: start recovery for dev id %d.\n", __func__, header->dev_id); for (i = 0; i < ub->dev_info.nr_hw_queues; i++) ublk_queue_reinit(ub, ublk_get_queue(ub, i)); - /* set to NULL, otherwise new ubq_daemon cannot mmap the io_cmd_buf */ + /* set to NULL, otherwise new tasks cannot mmap the io_cmd_buf */ ub->mm = NULL; ub->nr_queues_ready = 0; ub->nr_privileged_daemon = 0; @@ -3011,14 +3005,14 @@ static int ublk_ctrl_end_recovery(struct ublk_device *ub, int ret = -EINVAL; int i; - pr_devel("%s: Waiting for new ubq_daemons(nr: %d) are ready, dev id %d...\n", - __func__, ub->dev_info.nr_hw_queues, header->dev_id); - /* wait until new ubq_daemon sending all FETCH_REQ */ + pr_devel("%s: Waiting for all FETCH_REQs, dev id %d...\n", __func__, + header->dev_id); + if (wait_for_completion_interruptible(&ub->completion)) return -EINTR; - pr_devel("%s: All new ubq_daemons(nr: %d) are ready, dev id %d\n", - __func__, ub->dev_info.nr_hw_queues, header->dev_id); + pr_devel("%s: All FETCH_REQs received, dev id %d\n", __func__, + header->dev_id); mutex_lock(&ub->mutex); if (ublk_nosrv_should_stop_dev(ub)) From patchwork Wed Apr 16 19:46:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uday Shankar X-Patchwork-Id: 14054438 Received: from mail-yw1-f226.google.com (mail-yw1-f226.google.com [209.85.128.226]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D1070224B1F for ; Wed, 16 Apr 2025 19:46:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.226 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744832781; cv=none; b=F+ikyK1sSBhUpCpeUR27nZ118voY6J/M/NK0yJZaQ+fawuUe6IC2GCGNWI7yRKQdrkRk+XMPFAgy9lUOoAOCV7NQKgdo5Ok02rRA9kV+Odi7XVfxg5CrCkGuR1s0JezvZnQsucCBiu060w4/Lwb783udEUr/N67PZvfP/s8gZRY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744832781; c=relaxed/simple; bh=JGLutgZ75KHuHWrR2YnD7fo4yUfX4ANugcfm5HFDpUA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=I+KY9XFBTW5V4FlafbaJQVqkjCt6Jn8VXYzu4HaU3Zdf8PKytk6mQqdX2ZmHUvgsDPW2XwaEJTvuBHFhzryoh2NcYgMdZuOF6ot9loNaUnjg4F7E5NtOQBibau42QFk8vE4IkqrevPkX8X1u+5sZlJlRjBIn5Yfp4yGOzRbEV2o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=MxkWFXI+; arc=none smtp.client-ip=209.85.128.226 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="MxkWFXI+" Received: by mail-yw1-f226.google.com with SMTP id 00721157ae682-7054f0e933cso58105527b3.1 for ; Wed, 16 Apr 2025 12:46:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1744832777; x=1745437577; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=yLmRu9G8uG9ADbZkf+KZnj2bBZ+uuBo+D+GI2ZjdHfs=; b=MxkWFXI+gm6vp+1VuUzcxacQhsvZEGfVd/awsC62+rSPsU1BeYC75nKRcROI6uN1zG 6VhqIk/g1aSMUfj5T5tkprPfcsxWCJXW6ChB3l6JzA2Qq5eHaATyo4oljhwV2quBNAyu BXTvrSIpyEejnpmQZk4lc4Y+UU0POzCfVncn4bDin98XUpKebALNiKAFxexk7moEFf20 cEeDyuXAonhdof0MZFhqrzCO1KwEAa1XlXSxOfj8+ezE68DKuiCfC4aG4gdzfnvV+2Hk aiRTmHPUq1p52rH4TxORjeFKTaoNQUeQBtT+f21x/XZsV2XiOWdz4xezvsFvRH7wNktv R7qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744832777; x=1745437577; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yLmRu9G8uG9ADbZkf+KZnj2bBZ+uuBo+D+GI2ZjdHfs=; b=VvOnPrVTIxFkNYAB3r5rcsyQ0+x3qozPU+EWpUo8wAUGnJwyC93gjJG18q60xpTp+Y +QxB4LcswDqixVGVzdhsG1KSmO78mmVkdWNNghB1Fi2mPagyyQX90Fa/tehvXTEtrz1Q ZglsifR8Aee3RCYnt2TM7yROFE4JfKmAGx9fNJwGsjhUp8OHzUoXdKH+Bg9g5qfyQcjM OpIYHfNWSjsgOjK1MQQC/Fl/poF2D6JGD+rLDj0iJoX8pHFX6NkJAdAPLzqJPUfuOGwl 0J1H6is44GkciV13mXTtF9kA7Lu02lOUcOKnQ244Pobao6MVlNSBgWjnTVeYGapOKGss qV5Q== X-Gm-Message-State: AOJu0YzkG5PX39vCJkKnAv+T2+ImdpEuWEl9u7Vx/FAiN5uOFWhACd94 /AxIa7gIk/uq3zTyYKWo2pKXLpLQRh1GLHKwHICIO0UABHKMgpgd4pM5vebR0hvvxQccRKZEaia Rvd9irAcOEA+QH+hh4pOmD7tiG55hvZ3u X-Gm-Gg: ASbGncvv4w4Uy+vlohV0e0zFpXkwZit9UAKYZh5qz15Emp8Yd8uFLAwKWNbnTfJ/oq7 UboF9mKlrbUvydQp0P04uxCb6mZZ16aMyVmMDIDkgppB46fYp9O8h3o/QK3r67KPjL9XV/hgqty xjos3kR8/Fg3PUnsVCsXs5kf3GVBEilYHIDuVp3HCq5FmyEucYmQ491ri0gJAMoBoh3HyxU9Ggc 9108/jhEP4ry0FVbFaeqGs+x8X0nCiCZQ9KS88gCNIZ/MZBong7oZXyOmss0dmBK77m5W4RtBBl KwKJ8SEF5rkz6O5Q769ubr4xg22BdAhH9SnYBCNDFHRjEA== X-Google-Smtp-Source: AGHT+IGi/8SRV0dhXq13NAA6SwhXdPei0dwUitF9GbZqgDA1TOyEtsaJOWONfQ3mtyQfIdcmABsU3yUJ2EB+ X-Received: by 2002:a05:690c:6e09:b0:702:52fb:4649 with SMTP id 00721157ae682-706b335cfa2mr49583987b3.27.1744832777538; Wed, 16 Apr 2025 12:46:17 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([208.88.159.128]) by smtp-relay.gmail.com with ESMTPS id 00721157ae682-7053e0f393fsm7345227b3.2.2025.04.16.12.46.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Apr 2025 12:46:17 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-ushankar.dev.purestorage.com (dev-ushankar.dev.purestorage.com [IPv6:2620:125:9007:640:7:70:36:0]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id 9097934058D; Wed, 16 Apr 2025 13:46:16 -0600 (MDT) Received: by dev-ushankar.dev.purestorage.com (Postfix, from userid 1557716368) id 87502E417E1; Wed, 16 Apr 2025 13:46:16 -0600 (MDT) From: Uday Shankar Date: Wed, 16 Apr 2025 13:46:06 -0600 Subject: [PATCH v5 2/4] ublk: mark ublk_queue as const for ublk_commit_and_fetch Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250416-ublk_task_per_io-v5-2-9261ad7bff20@purestorage.com> References: <20250416-ublk_task_per_io-v5-0-9261ad7bff20@purestorage.com> In-Reply-To: <20250416-ublk_task_per_io-v5-0-9261ad7bff20@purestorage.com> To: Ming Lei , Jens Axboe , Caleb Sander Mateos Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Uday Shankar X-Mailer: b4 0.14.2 We now allow multiple tasks to operate on I/Os belonging to the same queue concurrently. This means that any writes to ublk_queue in the I/O path are potential sources of data races. Try to prevent these by marking ublk_queue pointers as const when handling COMMIT_AND_FETCH. Move the logic for this command into its own function ublk_commit_and_fetch. Also open code ublk_commit_completion in ublk_commit_and_fetch to reduce the number of parameters/avoid a redundant lookup. Suggested-by: Ming Lei Signed-off-by: Uday Shankar Reviewed-by: Caleb Sander Mateos --- drivers/block/ublk_drv.c | 91 +++++++++++++++++++++++------------------------- 1 file changed, 43 insertions(+), 48 deletions(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index 4e4863d873e6593ad94c72cbf971f792df5795ae..b44cbcbcc9d1735c398dc9ac7e93f4c8736b9201 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -1518,30 +1518,6 @@ static int ublk_ch_mmap(struct file *filp, struct vm_area_struct *vma) return remap_pfn_range(vma, vma->vm_start, pfn, sz, vma->vm_page_prot); } -static void ublk_commit_completion(struct ublk_device *ub, - const struct ublksrv_io_cmd *ub_cmd) -{ - u32 qid = ub_cmd->q_id, tag = ub_cmd->tag; - struct ublk_queue *ubq = ublk_get_queue(ub, qid); - struct ublk_io *io = &ubq->ios[tag]; - struct request *req; - - /* now this cmd slot is owned by nbd driver */ - io->flags &= ~UBLK_IO_FLAG_OWNED_BY_SRV; - io->res = ub_cmd->result; - - /* find the io request and complete */ - req = blk_mq_tag_to_rq(ub->tag_set.tags[qid], tag); - if (WARN_ON_ONCE(unlikely(!req))) - return; - - if (req_op(req) == REQ_OP_ZONE_APPEND) - req->__sector = ub_cmd->zone_append_lba; - - if (likely(!blk_should_fake_timeout(req->q))) - ublk_put_req_ref(ubq, req); -} - /* * Called from io task context via cancel fn, meantime quiesce ublk * blk-mq queue, so we are called exclusively with blk-mq and io task @@ -1918,6 +1894,45 @@ static int ublk_unregister_io_buf(struct io_uring_cmd *cmd, return io_buffer_unregister_bvec(cmd, index, issue_flags); } +static int ublk_commit_and_fetch(const struct ublk_queue *ubq, + struct ublk_io *io, struct io_uring_cmd *cmd, + const struct ublksrv_io_cmd *ub_cmd, + struct request *req) +{ + if (!(io->flags & UBLK_IO_FLAG_OWNED_BY_SRV)) + return -EINVAL; + + if (ublk_need_map_io(ubq)) { + /* + * COMMIT_AND_FETCH_REQ has to provide IO buffer if + * NEED GET DATA is not enabled or it is Read IO. + */ + if (!ub_cmd->addr && (!ublk_need_get_data(ubq) || + req_op(req) == REQ_OP_READ)) + return -EINVAL; + } else if (req_op(req) != REQ_OP_ZONE_APPEND && ub_cmd->addr) { + /* + * User copy requires addr to be unset when command is + * not zone append + */ + return -EINVAL; + } + + ublk_fill_io_cmd(io, cmd, ub_cmd->addr); + + /* now this cmd slot is owned by ublk driver */ + io->flags &= ~UBLK_IO_FLAG_OWNED_BY_SRV; + io->res = ub_cmd->result; + + if (req_op(req) == REQ_OP_ZONE_APPEND) + req->__sector = ub_cmd->zone_append_lba; + + if (likely(!blk_should_fake_timeout(req->q))) + ublk_put_req_ref(ubq, req); + + return 0; +} + static int __ublk_ch_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags, const struct ublksrv_io_cmd *ub_cmd) @@ -1929,7 +1944,6 @@ static int __ublk_ch_uring_cmd(struct io_uring_cmd *cmd, u32 cmd_op = cmd->cmd_op; unsigned tag = ub_cmd->tag; int ret = -EINVAL; - struct request *req; pr_devel("%s: received: cmd op %d queue %d tag %d result %d\n", __func__, cmd->cmd_op, ub_cmd->q_id, tag, @@ -2005,30 +2019,11 @@ static int __ublk_ch_uring_cmd(struct io_uring_cmd *cmd, ublk_mark_io_ready(ub, ubq); break; case UBLK_IO_COMMIT_AND_FETCH_REQ: - req = blk_mq_tag_to_rq(ub->tag_set.tags[ub_cmd->q_id], tag); - - if (!(io->flags & UBLK_IO_FLAG_OWNED_BY_SRV)) - goto out; - - if (ublk_need_map_io(ubq)) { - /* - * COMMIT_AND_FETCH_REQ has to provide IO buffer if - * NEED GET DATA is not enabled or it is Read IO. - */ - if (!ub_cmd->addr && (!ublk_need_get_data(ubq) || - req_op(req) == REQ_OP_READ)) - goto out; - } else if (req_op(req) != REQ_OP_ZONE_APPEND && ub_cmd->addr) { - /* - * User copy requires addr to be unset when command is - * not zone append - */ - ret = -EINVAL; + ret = ublk_commit_and_fetch( + ubq, io, cmd, ub_cmd, + blk_mq_tag_to_rq(ub->tag_set.tags[ub_cmd->q_id], tag)); + if (ret) goto out; - } - - ublk_fill_io_cmd(io, cmd, ub_cmd->addr); - ublk_commit_completion(ub, ub_cmd); break; case UBLK_IO_NEED_GET_DATA: if (!(io->flags & UBLK_IO_FLAG_OWNED_BY_SRV)) From patchwork Wed Apr 16 19:46:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uday Shankar X-Patchwork-Id: 14054437 Received: from mail-il1-f228.google.com (mail-il1-f228.google.com [209.85.166.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5BBE6211A3C for ; Wed, 16 Apr 2025 19:46:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744832781; cv=none; b=hXoZJYpPdjaceaJ8kDtkzCorK5wtlW3sKrBCaOXFdNa3y8UVxGHfIWyr+0oNxeEYMGTgws+kX7aAD5EvwNje0TmvblfAbauOkN9r5Fw4ERgng3gAK5ZkE+LNsQYpg2acM0I8iA8jtecCd6ESvX+A8A1n0jUPzO91364AecK1lG0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744832781; c=relaxed/simple; bh=6uOhhTg2M6Xc3JIAa7jixcn3vOphgn9bCMpImyxQ0aM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=foHlw+X1X7ath71z6Pkh0/c7pkhJsLPPFZWQHdBrjMeaJ2l4bg7E9KeK+QetLyCHgC0PZ6GaLlbSLyJDewVu4jN8bybsHR3/L3IIj3kXu4ycQOat53FsatNdd611lQBSCTAl7CC7pVeX3gmKHArsvtCq/s3bYWjVcC4KjvDy0T0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=cVCFFYKB; arc=none smtp.client-ip=209.85.166.228 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="cVCFFYKB" Received: by mail-il1-f228.google.com with SMTP id e9e14a558f8ab-3d5ebc2b725so223725ab.3 for ; Wed, 16 Apr 2025 12:46:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1744832778; x=1745437578; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=yq5esKCTo1m4AEup60elUDKAMcHgxmTnJjt4cP7Zh0E=; b=cVCFFYKBZ8ZtVyS+h53nof2wbdQMKdyHyg74Z7r/2scyY+qDqkSBNXmN8VzLOtCtyj CgEyVQ8374B3jqagSCv5Plszp2fmWoM/laYZ6JWTrIbiORWJ0bQwLnKeB1SFUA7hPQs0 XvkNdsAomqxRWob1TP7jvaV6vR0a7k+2DLEW+SkbQyPqvCv7yWjEArGy6DWRkkTUra6N Vhdgb+4Whlet0ThS5P0FRPD91JnG2vgI0bs14ZGsx8hV/65drzbXUlSVYR2EAs4MG/0c URYn8QRcGZhRDhfAUy1PQabuTB1c4d2tquoXFz06EbJOnpy7FgngHZob/3LiK9UyxWmM ub3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744832778; x=1745437578; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yq5esKCTo1m4AEup60elUDKAMcHgxmTnJjt4cP7Zh0E=; b=v6k6zr1wSv42QCDj/0s9+XBkJhswEGRZgnNvHw0qK/wpp4X03rcRMS0GVpmdqB9B5a 4PWFEze1MsPRNjsquqekn6uDvi4g1EnKNZkHuK9vqgXycwG26cWlkqIqNHP6S8sX2OVz S4NmjPgAlUS7AJxeCr9/nHRmebz/X6rWqKXJzJFItTHGXAlmadPBEejD8h8oTbjh1flz IQAjwSpMGudu7/3W11Gf2NgcEHeH5YH47uLCIwYYEzZBE+C954p+oQ8SW2ALDjJ7zp95 hBc5Xwx/Z8Qn6Sq1gJ3nPQTQFF99HtWCrH1cVBNIb5xlkgCkYnLWHteELnc5njEGX4gB mxEA== X-Gm-Message-State: AOJu0YzZvjUMimoCfTrSIecPfFvwVIjj/zd/VKsQdzftGeFonRdX3ENv 36Y6xmzwe+A82Qa4TVcrbouDDGvZ6NvArtkzKy7D8aT85TkY3GhUUc1/QakZtVdjfWTwyWSUQdE i3+3TupoplwfliBOm/FW752ykmlzdaQMh2Ht6zFCH+Rqg1WQD X-Gm-Gg: ASbGncvAHtmnwjZ9y6Xqc+PYVFNHFNFeNQ6JjC9/HpSjl4i7QT9yl7mkxWJEfXOJKcF RMkEfmrQB6F1CJsURo9J0pSwOL64+7I4eYUI/0CQy6KJa+MtlNLRfEYmppdD5N86oX9xNA2sPyN GAyr+3qM5Z6lwcW/zxcWqibmYfV55LlihWqbCY6cQjrz9DtOjO7FX0JabDDGGOhFBwc17zMSbLM Mb/25S9oos1lwZMZaHUb1R9yqdk1pwR3xL3fiXwRHjT2IpLaRrVNFXO4uqRiWEGeTo1PUHJ9H+s 9+mN4Xo0Rtv+lEz7Dpv1zkpajkINBOE= X-Google-Smtp-Source: AGHT+IGFFL/1z+Lvd5ijEsYgZEptvHunfhVfOarSer7ZQyhQrlZqQd0cZQYZgZi9sOPDgPcEnaNHXINcKFi1 X-Received: by 2002:a05:6e02:1fc3:b0:3d3:cdb0:a227 with SMTP id e9e14a558f8ab-3d815b123fbmr33400865ab.9.1744832778357; Wed, 16 Apr 2025 12:46:18 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([2620:125:9017:12:36:3:5:0]) by smtp-relay.gmail.com with ESMTPS id e9e14a558f8ab-3d7dbaa438csm8540685ab.41.2025.04.16.12.46.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Apr 2025 12:46:18 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-ushankar.dev.purestorage.com (dev-ushankar.dev.purestorage.com [10.7.70.36]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id 8F90B3404A1; Wed, 16 Apr 2025 13:46:16 -0600 (MDT) Received: by dev-ushankar.dev.purestorage.com (Postfix, from userid 1557716368) id 8E5C0E409A2; Wed, 16 Apr 2025 13:46:16 -0600 (MDT) From: Uday Shankar Date: Wed, 16 Apr 2025 13:46:07 -0600 Subject: [PATCH v5 3/4] ublk: mark ublk_queue as const for ublk_register_io_buf Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250416-ublk_task_per_io-v5-3-9261ad7bff20@purestorage.com> References: <20250416-ublk_task_per_io-v5-0-9261ad7bff20@purestorage.com> In-Reply-To: <20250416-ublk_task_per_io-v5-0-9261ad7bff20@purestorage.com> To: Ming Lei , Jens Axboe , Caleb Sander Mateos Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Uday Shankar X-Mailer: b4 0.14.2 We now allow multiple tasks to operate on I/Os belonging to the same queue concurrently. This means that any writes to ublk_queue in the I/O path are potential sources of data races. Try to prevent these by marking ublk_queue pointers as const in ublk_register_io_buf. Suggested-by: Ming Lei Signed-off-by: Uday Shankar Reviewed-by: Caleb Sander Mateos Reviewed-by: Ming Lei --- drivers/block/ublk_drv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index b44cbcbcc9d1735c398dc9ac7e93f4c8736b9201..215ab45b00e10150e58d7f5ea5b5d13e40a1aa79 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -211,7 +211,7 @@ struct ublk_params_header { static bool ublk_abort_requests(struct ublk_device *ub, struct ublk_queue *ubq); static inline struct request *__ublk_check_and_get_req(struct ublk_device *ub, - struct ublk_queue *ubq, int tag, size_t offset); + const struct ublk_queue *ubq, int tag, size_t offset); static inline unsigned int ublk_req_build_flags(struct request *req); static inline struct ublksrv_io_desc *ublk_get_iod(struct ublk_queue *ubq, int tag); @@ -1867,7 +1867,7 @@ static void ublk_io_release(void *priv) } static int ublk_register_io_buf(struct io_uring_cmd *cmd, - struct ublk_queue *ubq, unsigned int tag, + const struct ublk_queue *ubq, unsigned int tag, unsigned int index, unsigned int issue_flags) { struct ublk_device *ub = cmd->file->private_data; @@ -2044,7 +2044,7 @@ static int __ublk_ch_uring_cmd(struct io_uring_cmd *cmd, } static inline struct request *__ublk_check_and_get_req(struct ublk_device *ub, - struct ublk_queue *ubq, int tag, size_t offset) + const struct ublk_queue *ubq, int tag, size_t offset) { struct request *req; From patchwork Wed Apr 16 19:46:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uday Shankar X-Patchwork-Id: 14054436 Received: from mail-qv1-f100.google.com (mail-qv1-f100.google.com [209.85.219.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CD6A01547C0 for ; Wed, 16 Apr 2025 19:46:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.100 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744832780; cv=none; b=SIvZEsagknb0nFq3+60Igd9iq2Ca/p79CTELnfpWFkNQaF4GFRaX8qipFN1N0kqU/C++EFqYIuSlA+pcKtpuUdoQgHjsj/ioEUQ5lKeXxDVSCoeWdivkieis2SqkmIoXqRX4mfK8rQKZfP0I2UZRfsBFqnEwy/BdPaJu5FZB3nk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744832780; c=relaxed/simple; bh=KZyqYa2QO8C5zOaR5Qlffvttg9elvID00aTwi/drGnQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ECdoJds/NNPD6r7vvkxbBINWDGS0fVtq9635qS9U9Rqih8HgTzPSbSnuKFOWXBbj3HnJ7FtE2nTu16e+Kd9L1wwKIvjYH5PcR1GHcXdeDZFg53dhaWV9vM/bnCflwQS5tqTOj2Ze5qPbakStxHvDhT0KldjibOt4zEs+YN0d/Qo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=HL1tspZ7; arc=none smtp.client-ip=209.85.219.100 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="HL1tspZ7" Received: by mail-qv1-f100.google.com with SMTP id 6a1803df08f44-6e8f06e13a4so11233736d6.0 for ; Wed, 16 Apr 2025 12:46:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1744832778; x=1745437578; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=5FSkTMVQKVF8+T3ftLHZwHo1bf1YTsSlwi8hM6dxAd4=; b=HL1tspZ7i2igxAAb8JPRRjmOoVYQki5/VkK8e37jI5nm734wAlXG2AdJSGuc8sTLw/ 4+g2MFlNxFBth1Ic3y/dHajDdmLRZfXqQnib4xhPSqXdu3RmFcfjfBXJine2WcXYI4FH 7pdQCGtpqCCdRzFUgcQxMxUxig7yF8ncqAs0NGuQVFSELoRpJeUc4q4XzkXPuYyoIYpo HKfZCSWjhrAfoQzjX1gbnzP2mJmqTECdy95h/hmxfLqfiJrW/54VAM/V6cOGw6F66xiv 5ooeSa+3fhXmfHmh3zymeP0RuAShO1bT7SStQnXKevTMsKBSpzbLFFMbMH28dteSWYRH xPLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744832778; x=1745437578; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5FSkTMVQKVF8+T3ftLHZwHo1bf1YTsSlwi8hM6dxAd4=; b=jXhnPes4/xaFQkQzWzT/EevdAEDhxWTPsHwKprSti4nANlmq7VJ9qIJBz2o59VrAZH hlPV9Imto8GL9bWWPy7OaxbuprDnj0qwR11rjcLhY2CDtJF851qy0jWBpVUd9Hrmr/vf cEQEprObIx0aMDW2IM34VFmpPuWfigKIF0qa0GWXNPmLA1DcmLv92jLDDW8JrYHamGPE zBJzCyWZDM1rB22XjNgcmfqM0BiDrfI7rKAAmCjE/wiLlrjdOiw3FgQ1ziuHKFQ0oPp1 T1AfPuxXcCRBstspzBNHmLyeYwV9o+heoh6+7Lx/Yy7tBCzQgzyxlw3WRYhLmFvnZ7y1 uVYQ== X-Gm-Message-State: AOJu0Yy3CWsm/FAaStNTJ64ahx5n9DaJEG4bU9gUDj9drbdQ+1L9Y+R6 awYEnCi+lBvzdDbf8tMqypSq1M64ImzUmsEBNf0mXYrJiMghRMeK2USPoLKS19MOiBfpTgYP72F PjTlsrs1HBkWjhQ63pxl9GJg8NbiE57QodV0p44aGMwTBqkF8 X-Gm-Gg: ASbGnctKvXjjyVbrzC5ak66gs4nyT6a8PvswqvJromLPTkaVXFC17K2K5HTDZxwSni/ vB6sKqc0g3AY9pd4IV6TzQNjZcYdjUxH+iV8tuSIKS/494ezr465Q6n6OHCq+3Ut8XmyNks56cX SydN4mlSMqa2qFXkELzVoHXvw7yrIkQOXcqpAttx0YhPaFs60vZ7vimTuZD0jfCKUI3/zGtEm8t GXTEVdpgH4wB8KnJcgeie8v+BrU2v2UiPxfSMUe7N00S3J/vm4fbeRSOBpTeqlBKX1Sl1xNbQmB ZYqNAyauX/KEVla6YrJ4Qd5SufkYTaY= X-Google-Smtp-Source: AGHT+IEdAOO/a/NWoIVz4hFvCWYt1cOs67Bo6EUpAOIqrH3uPHmMDf4q+6XjtQIc4pDUHkA3q+f3b3HhDEiG X-Received: by 2002:a05:6214:cae:b0:6e2:485d:fddd with SMTP id 6a1803df08f44-6f2ba8dd00cmr2037156d6.1.1744832777729; Wed, 16 Apr 2025 12:46:17 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([2620:125:9017:12:36:3:5:0]) by smtp-relay.gmail.com with ESMTPS id 6a1803df08f44-6f0dea12d3dsm8179116d6.59.2025.04.16.12.46.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Apr 2025 12:46:17 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-ushankar.dev.purestorage.com (dev-ushankar.dev.purestorage.com [IPv6:2620:125:9007:640:7:70:36:0]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id 9849F34067F; Wed, 16 Apr 2025 13:46:16 -0600 (MDT) Received: by dev-ushankar.dev.purestorage.com (Postfix, from userid 1557716368) id 95775E407EC; Wed, 16 Apr 2025 13:46:16 -0600 (MDT) From: Uday Shankar Date: Wed, 16 Apr 2025 13:46:08 -0600 Subject: [PATCH v5 4/4] ublk: mark ublk_queue as const for ublk_handle_need_get_data Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250416-ublk_task_per_io-v5-4-9261ad7bff20@purestorage.com> References: <20250416-ublk_task_per_io-v5-0-9261ad7bff20@purestorage.com> In-Reply-To: <20250416-ublk_task_per_io-v5-0-9261ad7bff20@purestorage.com> To: Ming Lei , Jens Axboe , Caleb Sander Mateos Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Uday Shankar X-Mailer: b4 0.14.2 We now allow multiple tasks to operate on I/Os belonging to the same queue concurrently. This means that any writes to ublk_queue in the I/O path are potential sources of data races. Try to prevent these by marking ublk_queue pointers as const in ublk_handle_need_get_data. Also move a bit more of the NEED_GET_DATA-specific logic into ublk_handle_need_get_data, to make the pattern in __ublk_ch_uring_cmd more uniform. Suggested-by: Ming Lei Signed-off-by: Uday Shankar Reviewed-by: Caleb Sander Mateos --- drivers/block/ublk_drv.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index 215ab45b00e10150e58d7f5ea5b5d13e40a1aa79..5f9679c03305576bee586388cab82a6ea5472f8b 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -1291,7 +1291,7 @@ static void ublk_cmd_tw_cb(struct io_uring_cmd *cmd, ublk_dispatch_req(ubq, pdu->req, issue_flags); } -static void ublk_queue_cmd(struct ublk_queue *ubq, struct request *rq) +static void ublk_queue_cmd(const struct ublk_queue *ubq, struct request *rq) { struct io_uring_cmd *cmd = ubq->ios[rq->tag].cmd; struct ublk_uring_cmd_pdu *pdu = ublk_get_uring_cmd_pdu(cmd); @@ -1813,15 +1813,6 @@ static void ublk_mark_io_ready(struct ublk_device *ub, struct ublk_queue *ubq) mutex_unlock(&ub->mutex); } -static void ublk_handle_need_get_data(struct ublk_device *ub, int q_id, - int tag) -{ - struct ublk_queue *ubq = ublk_get_queue(ub, q_id); - struct request *req = blk_mq_tag_to_rq(ub->tag_set.tags[q_id], tag); - - ublk_queue_cmd(ubq, req); -} - static inline int ublk_check_cmd_op(u32 cmd_op) { u32 ioc_type = _IOC_TYPE(cmd_op); @@ -1933,6 +1924,20 @@ static int ublk_commit_and_fetch(const struct ublk_queue *ubq, return 0; } +static int ublk_get_data(const struct ublk_queue *ubq, struct ublk_io *io, + struct io_uring_cmd *cmd, + const struct ublksrv_io_cmd *ub_cmd, + struct request *req) +{ + if (!(io->flags & UBLK_IO_FLAG_OWNED_BY_SRV)) + return -EINVAL; + + ublk_fill_io_cmd(io, cmd, ub_cmd->addr); + ublk_queue_cmd(ubq, req); + + return 0; +} + static int __ublk_ch_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags, const struct ublksrv_io_cmd *ub_cmd) @@ -2026,10 +2031,11 @@ static int __ublk_ch_uring_cmd(struct io_uring_cmd *cmd, goto out; break; case UBLK_IO_NEED_GET_DATA: - if (!(io->flags & UBLK_IO_FLAG_OWNED_BY_SRV)) + ret = ublk_get_data( + ubq, io, cmd, ub_cmd, + blk_mq_tag_to_rq(ub->tag_set.tags[ub_cmd->q_id], tag)); + if (ret) goto out; - ublk_fill_io_cmd(io, cmd, ub_cmd->addr); - ublk_handle_need_get_data(ub, ub_cmd->q_id, ub_cmd->tag); break; default: goto out;