From patchwork Wed Apr 16 00:59:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uday Shankar X-Patchwork-Id: 14053012 Received: from mail-yb1-f227.google.com (mail-yb1-f227.google.com [209.85.219.227]) (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 5E01E204C3B for ; Wed, 16 Apr 2025 01:00:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.227 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744765215; cv=none; b=Dxk8u8kRwvnXNGYjLD6gWdQI/hM1dR2YfjS/zkoIiE4vZXZuzQsJVv8GiqrfANxL0TfRbtJkT8xcClrAQ7uGljpMusqdOOAK83jqvp3l8kUCRBsNNhjJOj5gNECOD4ShfOJdikdnMeLsad1kd/Rz4MDbFxRc53WSucoSPmI5Krs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744765215; c=relaxed/simple; bh=sfK3HXHKQ+vsF7uU0m2uSfGubbYYOuDDGvuSqM8XGkY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=PrVIFtxIBncsRG3YSxEb/dFg9QP2QunqJFWpf4mgWXSjSsZJnMG/hHDFmf1xJmUikmM+d4Gkc2EDiFMPOF++DoYOoTvIArXQDSF5zSH7vURMqtZVNgogNVzJBBbH0bzNpQ713VwPJS6BVnp8tKEkzIZYGbaBoNYX9a/eGC+Mr1s= 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=LIoezgcW; arc=none smtp.client-ip=209.85.219.227 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="LIoezgcW" Received: by mail-yb1-f227.google.com with SMTP id 3f1490d57ef6-e6deb3eb7dbso5042855276.0 for ; Tue, 15 Apr 2025 18:00:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1744765210; x=1745370010; 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=PVNNZ8nNV1VeIw2zvsjmKAcduOkjz1KfbzQYh61/aXM=; b=LIoezgcWXwBgHXA6vmmJpnF9QTI2KF/mpZOcQCLD5cXwLioOFCYrawm2qpeCeg3zlc sJ9qJR71cEZqSkm2tn/sF7eT3QGWQSMEIodq+usDOE24c4DCi357lLZLtKzYDgrpf2v6 No1wxL9l24HlRSTpV3oW6oA1X1skyDyEG8eZ45UjmfbVl45/2ojMDD5mr3Nqxh/q93DD EHUWuy6C5G1fThH6U4N01JvQprxLfYvLL3iFVJXfxWZGyADyiYwsvivt6HsufYma8TJM akn2R4QM7dlM1Zq8xv71q9H8NhnOP3lobbzleqqbleCZveizVjcTWcjFhIlr+ckLDcgk VPqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744765210; x=1745370010; 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=PVNNZ8nNV1VeIw2zvsjmKAcduOkjz1KfbzQYh61/aXM=; b=p2x5ql7Sdl3LIIJuz+8sk32PIwGnD9Slx1J+y4+Y4eLqy/2UI4t6UXhCXWhIlFZ6M0 BS/2vZiifSUoy2EeReO4UrHVDkXGh5L9IjOv4C0uB4mvz9LdRe6SgXfTJBV6CxU5ggqd Fd5wpD8gdp6cGYHt8naUYXIpZngzKkAR+Hg/zhvbLlCaC/Uz9ItcnUvzz6PWuab2/kc4 k6DsMu+wNQiQFZHFhVacm6zVgVhaIoa0CwiFQr2Wgy2tJ4s25ENtXnkNiLNIOx3wFiDi AcjeU8kPLyxR0Rl+7C9d12a0OLkjIXv2sNNTChGLRNSSggNsQpmX2txodQBPDJEZaBTV 2BOQ== X-Gm-Message-State: AOJu0YxMpSeXErWcnf3O6jyr+Jd6MnXgenJS+Z7ggMlTXKGxQLLPmVvL UTBhBLIVVTeD/U0L9U7/QtvKx3t6/4J2t3seMIM9f4DeB3m8M+Tt86Bh4aYlnissftZK9wZvkur Drx20j2uefe0MJGuP7T5zVemnkRWxlnhT X-Gm-Gg: ASbGncv2iE51j27XvsB63v/JEXzwx2LRE+jYcjb8KFto2UqhpTY8nBSMLj6px1xJINV 5PwRjAaTWrZpbygdYkn972slv+jipIOQJdItYY4gCDC0CwmVkxwWBUty7JWwTPZDIK4l6+KYlSI diZRIXZA4kFxk8GAlol5EkfOVkRGZ3qr2bUn2VnrDDhFFKmqQ7FU4PiOmMBucI8dPf+CJgcqFXK Wm1GleZqK2lVG58bWgPNXjnTYPuj4wz/u6G5qtkd/Am13GiazOVr2QcrFZU4SuXRJxeHl6zebQo QE9c9btj5OV/Kx3e9kClFOyFU/7FyToJSaiOqrW/CP3smw== X-Google-Smtp-Source: AGHT+IHT2/nszmvKTAlkI/lLHpEoLtoU6fdUwc06HofmppuXRb6QZJ46E3HhXJfyV87/DEtapoejWU1kixdH X-Received: by 2002:a05:6902:18d4:b0:e5b:4482:a4f7 with SMTP id 3f1490d57ef6-e726e644c5fmr2101574276.12.1744765209351; Tue, 15 Apr 2025 18:00:09 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([208.88.159.129]) by smtp-relay.gmail.com with ESMTPS id 3f1490d57ef6-e703245aac1sm399992276.9.2025.04.15.18.00.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Apr 2025 18:00:09 -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 4DA7F3404A1; Tue, 15 Apr 2025 19:00:08 -0600 (MDT) Received: by dev-ushankar.dev.purestorage.com (Postfix, from userid 1557716368) id F05B4E40318; Tue, 15 Apr 2025 19:00:07 -0600 (MDT) From: Uday Shankar Date: Tue, 15 Apr 2025 18:59:37 -0600 Subject: [PATCH v4 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: <20250415-ublk_task_per_io-v4-1-54210b91a46f@purestorage.com> References: <20250415-ublk_task_per_io-v4-0-54210b91a46f@purestorage.com> In-Reply-To: <20250415-ublk_task_per_io-v4-0-54210b91a46f@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 | 75 ++++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 41 deletions(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index cdb1543fa4a9817aa2ca2fca66720f589cf222be..9a0d2547512fc8119460739230599d48d2c2a306 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)) @@ -1952,14 +1941,14 @@ 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]; + if (io->task && io->task != current) + goto out; + /* there is pending io cmd, something must be wrong */ if (io->flags & UBLK_IO_FLAG_ACTIVE) { ret = -EBUSY; @@ -2012,6 +2001,7 @@ static int __ublk_ch_uring_cmd(struct io_uring_cmd *cmd, ublk_fill_io_cmd(io, cmd, ub_cmd->addr); ublk_mark_io_ready(ub, ubq); + io->task = get_task_struct(current); break; case UBLK_IO_COMMIT_AND_FETCH_REQ: req = blk_mq_tag_to_rq(ub->tag_set.tags[ub_cmd->q_id], tag); @@ -2248,9 +2238,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 +2932,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 +2943,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 +2986,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 +3004,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 00:59:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uday Shankar X-Patchwork-Id: 14053009 Received: from mail-oa1-f100.google.com (mail-oa1-f100.google.com [209.85.160.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 5003B204C18 for ; Wed, 16 Apr 2025 01:00:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.100 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744765214; cv=none; b=G6jM32Hm2yu0BKd6E0gE659fb9odtcoBdgBW9sjtClHPTxNnNcVMXgR418VhIT4Z+n4zsdlHp6SSw5cZqhNS4PV4bnZs5DS08H735F6tqs3XBowtXymgXusCMaqPvHGtnycs6Wi2CT2HrAgUCQyDeu5t4hIiLdVtFECOcMsNQGE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744765214; c=relaxed/simple; bh=ht1z5tMmO+4FBWu5eprttGdN/Q0lnY9pm88IS3LYzgU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QwKUPdPripwIlHm5qPSntGoHivjbegeQAJGXbHH33Zdc+aMuPuxjaNnu5vXdUBy1CMGUSIpnZX7rp3Bngpcb3Yb4ILwvsgXhflFDlqXOUuflSJOWifp6X3lA+MNXD5E72KHJAxruxY5bbpNNBdrD7Es3wme4xFHmMUsubz/5eGQ= 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=fNBTnJnW; arc=none smtp.client-ip=209.85.160.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="fNBTnJnW" Received: by mail-oa1-f100.google.com with SMTP id 586e51a60fabf-2c6f27599abso1648153fac.2 for ; Tue, 15 Apr 2025 18:00:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1744765209; x=1745370009; 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=BeIb+nOqtxi+iaoqYFgPTqpRXHwAg24kReKqzI+s5Wc=; b=fNBTnJnWnvdsmDR0kdN7rjmZJ/KJcM3LeTEezJ+Z7tj8oFLWxhRiWuf5eSOQt9QcU2 rH6BCrg75G+UAhajiZpGJMyPuGPVx0AKocIbrl42KzHBXdJYozhFHrotnhLUZvwC5oa9 dM7o6KOGSwqbRN/kFa4h6u83DJqHR3Fu0oW9rzqO13AErLeLDh/l+N8Z9n9DRMlA1oKU NvmCWClEEj6QfkLE95Muhluu9Z6spTnyfHIQ93eHH2PBWBbgoGdYUEnpBT5l1cLYgblf l13qgwFskljAMYaHFzdVbJriCrEQ5Yw8Hf1z/HpiT7Zfkog1EZpFNp4WCGzsgGctYmQL qTcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744765209; x=1745370009; 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=BeIb+nOqtxi+iaoqYFgPTqpRXHwAg24kReKqzI+s5Wc=; b=ucBIbL4ODeTvIdTzwPx3/+4VYgoMu14wf4jL/ux3crIOjvVTyB2axo8vDQqYzwxNJ8 paoTFQB1d4uNgV+Is2GjOyxG+zhO4zcyH0qULopCSK2QQtN4hBMMd3XF2Ai71gv8RxPN kfWK1k+1lsWhI0EpNPr7SkgtChZvjY2kpaK3EhtKg6hU3/3I68LDgVgcZev8nbD6VD1o HCsI1ufB7/ZtIv0VK8u9YD/FSkHJ5y9Cdb4gt57F8b4YtbzG+2uGs4XWK5e/puz9pAyQ 1CKYEjvj49bWLCGmSj+bFZ2T9CLc8Bd+beBxjbXoMbftTWi0Q+ImJdGGxpfz2EpfpTXM mvjg== X-Gm-Message-State: AOJu0Yw50x3FycLDqkqP8IMPUJoNVaz3/rsbDZP0Oajf0fJWUmEJPZQd pCPelTVBFoh1B+niKWyMwWB9sLq24NZPZiL9IGuDqun1hRiPO7/v7tzQ69TO1Kbc9rzI+zO7Cei KrpLFBcpXGwAQgyO9w6O00mp6bjx1IUQIPQfPDFblPpR50cwb X-Gm-Gg: ASbGnctBszd0mcjU7dprrCkaUc0x5WTOWsub/H+aar5axn+M2qxR1+CTk7f996BZHM+ PEAUgaBTSdky3wv7JrodSxj+09MmcSjLlOC2BnBAEbvexyrfoIqfwM39z1h6o+aYf55/bZ5ar6N 3o3YVVJWXRIyYdiH+0bwsWCNgluMNtP49oAXfz6vt465vjCsdmvozXfQplsm/vPs41XQuTA/1x0 FDTvn9QVXf3O4wPF71194er7MpPQOn8dab15X1xO6hYfoUfCo/80djA2UBE4oxIF/C7AQzrs7ag DvjW8IXhZcPPNR8KC0npoZec7GdC/Ic= X-Google-Smtp-Source: AGHT+IF1lVFyFNvpYCSWetCStup9q/NCRo+l8krjI7JKuqiVsfplbUneTzIj60Z0qcSmQQT/A8J2k4XxTof6 X-Received: by 2002:a05:6870:f10f:b0:2b8:2f9c:d513 with SMTP id 586e51a60fabf-2d4c3afcb4bmr842541fac.19.1744765209591; Tue, 15 Apr 2025 18:00:09 -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 586e51a60fabf-2d096d49cddsm732785fac.38.2025.04.15.18.00.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Apr 2025 18:00:09 -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 099AF3402DD; Tue, 15 Apr 2025 19:00:08 -0600 (MDT) Received: by dev-ushankar.dev.purestorage.com (Postfix, from userid 1557716368) id 026B0E40ECA; Tue, 15 Apr 2025 19:00:08 -0600 (MDT) From: Uday Shankar Date: Tue, 15 Apr 2025 18:59:38 -0600 Subject: [PATCH v4 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: <20250415-ublk_task_per_io-v4-2-54210b91a46f@purestorage.com> References: <20250415-ublk_task_per_io-v4-0-54210b91a46f@purestorage.com> In-Reply-To: <20250415-ublk_task_per_io-v4-0-54210b91a46f@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 9a0d2547512fc8119460739230599d48d2c2a306..153f67d92248ad45bddd2437b1306bb23df7d1ae 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 -EIOCBQUEUED; +} + static int __ublk_ch_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags, const struct ublksrv_io_cmd *ub_cmd) @@ -1928,7 +1943,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, @@ -2004,30 +2018,11 @@ static int __ublk_ch_uring_cmd(struct io_uring_cmd *cmd, io->task = get_task_struct(current); 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)) + 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 != -EIOCBQUEUED) 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; - 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 00:59:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uday Shankar X-Patchwork-Id: 14053011 Received: from mail-pg1-f228.google.com (mail-pg1-f228.google.com [209.85.215.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 D2F781FF1C7 for ; Wed, 16 Apr 2025 01:00:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744765215; cv=none; b=Zz7ZjxFFguSZXMl/lFhsCjMsL7QPTpQtQaEQwhB9UGOG6PpJY8dkfcNwY4AOK67UkL7G8dPfRr90jSuxsnx57lnSwJcWDJNdmFZGexm7sAzqCwjxCs0BbtsnCqQ6KsGsuVDeaIqMlSYJYwy8vMy9yufay6/AM1+NnKs7VYz3n78= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744765215; c=relaxed/simple; bh=Cgf3ztYIvwTUzfBavcvlyHRPUbRdvIfXW7B4VyEJqiU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ETkkA0xoEiYKEfZkkBg2aAjWhF2DvW/o81xwpqXAafZdHetYQQAlBzzC1ii2lCqHXSWSEN8YzITZaTiwDKgLcjhmKyZddxBWnSALFfs+FLGpzCeD49kJEcov/YmwTvfr8GUMV14yz8tZ/YK3MDRiWrJAuvzjMmZqHm8Nbkb/PvQ= 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=WZVgTC0c; arc=none smtp.client-ip=209.85.215.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="WZVgTC0c" Received: by mail-pg1-f228.google.com with SMTP id 41be03b00d2f7-af9a7717163so6406718a12.2 for ; Tue, 15 Apr 2025 18:00:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1744765209; x=1745370009; 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=dhLhuSAM50uIVAVygGan8Ma39tavmo4MC520V/vTBOA=; b=WZVgTC0c4yBeZvk7EPZH335fLj7RiQCswlW7NzF7iRFxMVjmftyVtTxOkk5CkOgl70 635iwrihJsiBzh/B4vpdksW6v2N07Ymleh5ZTpQvGPe0iefNt4lx9/nOppU+9X0esGQE x8ZwQUXrzZkEn8o10hm0CAMgYTy0iKfQcA8JClc8qAHs8z+k7szORaUec94SFKX61RL0 osSo3aql4PUnYG7hvVjyJYaO+CgW5iSxTZaZzKmb6essQua6vSsf99yC6EYjOjjfvsJc xbna00rimmwdDaIFSZ8nYJVBK+2TDARgTKi9/JnXYkiVfrlcVHZZmnpo+nO0Ohp+hpQr pt7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744765209; x=1745370009; 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=dhLhuSAM50uIVAVygGan8Ma39tavmo4MC520V/vTBOA=; b=YaoD0mzt0f8VMXfqj3D0WovLpK/KhNwA13bSsYNvEpmXsQWEbiiinfv/CxWjWe6NSH 3UgvrDt8J4OQaJ0oP2bW68NqYBqoMVuW8qmGqWgGL2ZhnNO6ykmHX1dvqRc0PnZTER9R Do/WuHlYxo7K7QviQOLQhvMmlzaf5qEckUXj5YyscozWxRtVQFh3hJgvBUsW6l9V3Slk FRfaM7z3XwO+/dT61x3ajVSMVEiE39ttRGz1YAqbsyHiSHmJz8FcIjk9bsJv0QKKD1lg NjM8UGZF7YVSrc34vvQwgBWq4z4ub+IG2tDNQo0JCrrXjl+P9TCo2EI2r3vxGuW55hLx Ahaw== X-Gm-Message-State: AOJu0YzTvQVm9SfuXN6Rf6micG+nucoVBkfttHnYz0qi+dSDMBZGdG/K s6PW24zhcCpQF93hByVYlJPh796ufBCMnP6HSmD63N9RueJkbf+mYNiG4ecuOqn8Zst9pYmMDOQ BlCO5A61m9DSbktnV0Hf33OB7QfPE24fRkEQb2EHqdlBsX3U+ X-Gm-Gg: ASbGnctnxe3wi0bAYtR2UWSpvwqIF+/jJp0bazSsDaoeUZxIIWW7yC5R/r7S14SOWbi yj6BpAjFC/7mVEoJ/fNHR1PqVnrf9CFKE9ZB1haS4VPSoerTBoHw4ZVJnLCBfC0/D/S33N1i9xK AFOP37g65r2Vqfuw1RsVYXNEJXab1eHjYvyhVS/lo4nIosjpgs4M7YiivoKQELmxAlN0/pb6bZE sFCQmAbGPMe2yjw3YV/WaPyItiDzmaRMLYH0TZsKpgmY4rnkGxNy8Qzwk8xPifDqN72U5RRGf9b StknOOX90A5BBge7ZFMWXxcZR2jvJ1A= X-Google-Smtp-Source: AGHT+IHMSUQChm2ODZHNSlbY2kPtq+hcH+J4hDdExeN/v+42veb6UrTGSYhbYLYnSQFVz5AVM4Ol4HrV3fQj X-Received: by 2002:a05:6a21:3943:b0:1f5:709d:e0cb with SMTP id adf61e73a8af0-203ae07e73fmr1670790637.39.1744765208867; Tue, 15 Apr 2025 18:00:08 -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 d2e1a72fcca58-73bd230db52sm563876b3a.24.2025.04.15.18.00.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Apr 2025 18:00:08 -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 0BBA3340351; Tue, 15 Apr 2025 19:00:08 -0600 (MDT) Received: by dev-ushankar.dev.purestorage.com (Postfix, from userid 1557716368) id 098FCE404FA; Tue, 15 Apr 2025 19:00:08 -0600 (MDT) From: Uday Shankar Date: Tue, 15 Apr 2025 18:59:39 -0600 Subject: [PATCH v4 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: <20250415-ublk_task_per_io-v4-3-54210b91a46f@purestorage.com> References: <20250415-ublk_task_per_io-v4-0-54210b91a46f@purestorage.com> In-Reply-To: <20250415-ublk_task_per_io-v4-0-54210b91a46f@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 --- 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 153f67d92248ad45bddd2437b1306bb23df7d1ae..e2cb54895481aebaa91ab23ba05cf26a950a642f 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; @@ -2043,7 +2043,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 00:59:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uday Shankar X-Patchwork-Id: 14053010 Received: from mail-vk1-f226.google.com (mail-vk1-f226.google.com [209.85.221.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 5975B204C36 for ; Wed, 16 Apr 2025 01:00:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.226 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744765214; cv=none; b=oo4xs41bkGQJnd8F8FVKo3jtf0LhDC0lRbWr/xwdW2jZwhOeMcRqDpgT04IHMpsaG5X8aw04Pqew52XdQcqB8LX0IvJgxDHilklOCUG93xggr7FH4jbOvgZlZcjS04IuazqYDICbqYZZZ6cjajdgNlTlcegdR89urpvsx8pjvXs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744765214; c=relaxed/simple; bh=ubz58Es7ldmCdO4VoHkD5rzH+upzrmrEWF5yqVCmpiM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UhjOlCxoXd9eJJER1My+YftmLCQ5N2Gy4S2rUXrg8ujfI5UeaTY8sTyaNL1Qs9PDSr2fw+kyuKPCvaKDoas59ryg4dY/ERF4WLF17GscJU/bLbfpAE/MBLLl9WpiYD45rg9hEQ0PGxKzvXzhfgm3n5iWI37DLmu9SZz7ltlDWIE= 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=Ptcs/E4H; arc=none smtp.client-ip=209.85.221.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="Ptcs/E4H" Received: by mail-vk1-f226.google.com with SMTP id 71dfb90a1353d-51eb18130f9so3078475e0c.3 for ; Tue, 15 Apr 2025 18:00:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1744765210; x=1745370010; 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=e/Rm8eRSTRPM7oJ5S9cVvxEnnOFl+oBtecWyVfRdd50=; b=Ptcs/E4HqfXvku3mEh5KCrBwkzxRUp7dFK4/BTYUUDfEEPt63PC9o1XESranlk/jGe zNg2PBLZOJ+Tyh9SR5HE8R6dbm1JeilDLlpdC0M44lvWU6E9i7uycE+ncZVT7u0kDl2B 5XtvXL2a1g0cOrFVAnly+4ZtdmDTvPgH8uv5ahWbPT/ym56B2nz0P7GTLFvMNTY/Eu7U 22qou+71J/+1+3HeEtgoeCXUJxCagYrr4Sj7ZsKNQPal+NKqb2+rJF9bWV1yclZZ63+a U62oOqyHZujll/JA5G5BMCnBDh4b+SNwGbek1dzNC8DXwZTFTlvgslAvcOOwV3Nmv7wt 588Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744765210; x=1745370010; 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=e/Rm8eRSTRPM7oJ5S9cVvxEnnOFl+oBtecWyVfRdd50=; b=GQwNxXU82nn4ovguVU0rcWMCiyFBQlgV/f+gI047OBCaTIF+Yp91QNrYU+n0jSrItv SN/OO9rKYy/ya+7doZQG48tQjUsFRDIqZ2fRYP5e9/2itsjgjhtgnEb5L/rMEgg9Wrx1 MgMNxMb0OD9tyuVcQS9y/F6tNDANIRcTbQCH8F1qSWWqa0UvRtTI7TE8R6OdGpRF5il3 L72EAv9eqLxpc+fEUx1fd5bHLXmVWEQDrCMvScg9AbfWzh1cNsXXVEqrvqnsfeGo1PR+ maeFXweloV8YHSSV3lWllfxTuF4E+O7XLGOMSPpV4hGgqWKGC1fNPd+0MfFDXwx/T+4X pa2w== X-Gm-Message-State: AOJu0Yz4XVoSDxQe+yaZwASe+jrpyj8cooiQy0XeoejxB6YKdp4AXhD7 Z+7PYMqw21rRj56TH6FEGi4OwKJg5YdSFutls6VwKBN9fBXjbM4amC7zXdbMahyvdIT4IHkcaiO xPBF67rNGF+GkpXKoyjnHmxnbEXnXWzucubH1kp37sI5ChJ67 X-Gm-Gg: ASbGncur+HgHa8/acprpsyDzIKHR0zAogl0X5vSrS40iK620myWUh3AQJUsYAlpKdgs 4+kUpQJGQ8Ox5Dq6Rl9zUtOZktpHqyz9H0PKPG/eAyVFDaYtYFHBB5bKG1BAPrMsVka+h0DFjKp +BP8DDnGMAygj3I/l+kA4r03B2/W1iz87ukZVgS1JhVHcAsYY/yDCwW8j5ltPpiXBKte3zM95i7 nCAwY3vAONV5ikPLa6RP+KdEE0eKi50YeF8gVvmH1ZFnbsVPWkznsCtn50sd4B7xsc1hNcGGTUn N2h4OVhFtFmg+dwjCxhqHe8SsHSYxwU= X-Google-Smtp-Source: AGHT+IGXQQYfjcDe2oR8+MYAyVs+81XYzD53ihDjxU44Yqa8/Drc11AX14R9kirGSEROTb85jdJuIoExG4uN X-Received: by 2002:a05:6122:1ac9:b0:526:42c2:8453 with SMTP id 71dfb90a1353d-529092d7ecemr1181678e0c.7.1744765209876; Tue, 15 Apr 2025 18:00:09 -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 71dfb90a1353d-527abd7afadsm834047e0c.4.2025.04.15.18.00.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Apr 2025 18:00:09 -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 12685340424; Tue, 15 Apr 2025 19:00:08 -0600 (MDT) Received: by dev-ushankar.dev.purestorage.com (Postfix, from userid 1557716368) id 109D6E404FA; Tue, 15 Apr 2025 19:00:08 -0600 (MDT) From: Uday Shankar Date: Tue, 15 Apr 2025 18:59:40 -0600 Subject: [PATCH v4 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: <20250415-ublk_task_per_io-v4-4-54210b91a46f@purestorage.com> References: <20250415-ublk_task_per_io-v4-0-54210b91a46f@purestorage.com> In-Reply-To: <20250415-ublk_task_per_io-v4-0-54210b91a46f@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 --- drivers/block/ublk_drv.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index e2cb54895481aebaa91ab23ba05cf26a950a642f..c8ce9349ca280b8b16040a1242a62b895ee01b5d 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,21 @@ static int ublk_commit_and_fetch(const struct ublk_queue *ubq, return -EIOCBQUEUED; } +static int ublk_handle_need_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 -EIOCBQUEUED; +} + static int __ublk_ch_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags, const struct ublksrv_io_cmd *ub_cmd) @@ -2025,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_handle_need_get_data( + ubq, io, cmd, ub_cmd, + blk_mq_tag_to_rq(ub->tag_set.tags[ub_cmd->q_id], tag)); + if (ret != -EIOCBQUEUED) 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;