From patchwork Fri Apr 11 00:17:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uday Shankar X-Patchwork-Id: 14047377 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 0293D2111 for ; Fri, 11 Apr 2025 00:18:09 +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=1744330691; cv=none; b=rb08AqDAKfLwVxf09ARLs2VilVjtHid+28xS0sylcJTgnkg8zZr5J6v93m0lreBcYwx2kxXvfK1taB18O8mDyidKyFiwQ3H56HFJ/jLRsy1syAkxBe2xp09/khGGbPE5E4Ti+u5NBAn7c835PvXw39XGZKAEMVf7Ah8UqSXWQ5c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744330691; c=relaxed/simple; bh=1bbPk4nVXbYSm5TyEHMtONnL4+3dFePnH4zVplRm4eE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Goe/pUtmjA28Vj6QNeWvuGzb3qgJftdHOTG92r+BVybS3KdaJlWTGKmFfiEWGGlKQWg6loFr/qjDYKTe8eTzNV//HzEm0mAzKHVFqIH8BoO/Hw5GpBiTSAb5QOL5cWLSBDCpyRNOK+Pf+2KLKRZ3LYDd2X32k+LQDLFeVKyUhrs= 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=HSdslIH1; 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="HSdslIH1" Received: by mail-yb1-f227.google.com with SMTP id 3f1490d57ef6-e53a91756e5so1361426276.1 for ; Thu, 10 Apr 2025 17:18:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1744330689; x=1744935489; 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=m1pEANpTFfOrSvpkXaufSvJPRX8F1QDAo8Dwnj8gdwI=; b=HSdslIH1hb4mOOSdJHH4H31WiGBNL3S+7VOElruChUCzcIMlBD5ek4dUQ3GwSBQd1o 9Zaeap7bsqKb058ULDWOWl5xdnuQF9Lcm9hA2DxB8VEwcEo1Nk2UrBR9Ei89oNKCRD8/ 4RJG68La+31dECVRachXfo0F9nFMMLcmUTYNrHsWicbuErTU5qGo2LJ77w8Wrdwz4W0p 16OEepGQrHg3MA1RarpZAsPoUyZdOFYsXYocJoS/AAxMFs5mE4bOUrjrGJH6wQGz8pkY 6aDvlekBnvEdsrOjp4wFNaVXO46N4sz/QIFEOM8pXUhGB3CXWnh44yyATk4Gh9EgkCaq KrSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744330689; x=1744935489; 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=m1pEANpTFfOrSvpkXaufSvJPRX8F1QDAo8Dwnj8gdwI=; b=lRJ6xvrGBT7BaJOOhRhqCHAyWpN6IBlJyS3QTwWYv5IdWNN1Y0iBj1IjT8JNp+1UbC UI1im5cWDYLU3r1vppwKKpAa1UpQ0pSnHSTzYVwhW6l9JRhObWwaVAqnhwylBDVU+Z/e cZ/nuwu8EQZaG51LuJVl+rNdeDk0x4qitg1UujkDN0gDG85Sb4ZgBQtogwAi2T/kcaF2 awGIB93BK8DX55QUMwxnJV2uAuimIL419rWHuHyHTO3b2boWA3wYrFz26dH8cQOmv3J7 BkiHiFkp76JTW9grInEuPFE2kF2+ywaeEoBGyDYfrmDDSgy91RAkzS9TWCpSadpvdMdt JmGw== X-Gm-Message-State: AOJu0YyNI3N71yPu80eaNoyFsev49YLsemPLbSJvnRpWzWfxwVUd60VO gzjTZXoprdfUHh7RwT+z08z29L4VyAMr29HHE3ZQ8aC9rEWS2TpOC8k3vac9RNzkUHS1eBSJagQ Zxbf2NxOV1OiJoyfmeZQiR0Nq7VC4YurT X-Gm-Gg: ASbGnctnC89fF7pTEdzEc6phSqCXEfK9ZNBFUXoZKI6F3OmKkKEdGVIGhUy2g1VbefL jgj+tP/s1cGHwzNT9AxuHHaz9pxxeyjrSf7VDY8+3Hu8Jc06Zy/zNxjVCr//Ptnv/bKSiNqaoEU mcL/188hAoRU1KJHtwWjdQ+dSlTMB80FKw4FXIh+ro71XruuMyvzBnRTm2p0KK4A337Ilh+EnRi OfdxxbYYaXtQ/0jsXNQQDkdXcuu+S41x2V2dXcnCq3NTWhYlq9dEQnp4Mayzu8HGxYa+VlO5Jm0 EkAAVkt9iGXVmxBOpUAP3pdSIGRyOYk9cwkMQWB38TWa/Q== X-Google-Smtp-Source: AGHT+IHDCddYSn9Z3YDHDroSQbsXGr5+M9ESeMT8G112Xnc9Bogsb1I8tuT7iew7Or2Cc/2KbfFi0jjlmACE X-Received: by 2002:a05:6902:cc6:b0:e5b:3823:4176 with SMTP id 3f1490d57ef6-e704de9bf92mr1781004276.13.1744330688844; Thu, 10 Apr 2025 17:18:08 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([208.88.159.129]) by smtp-relay.gmail.com with ESMTPS id 3f1490d57ef6-e7032479f34sm340868276.15.2025.04.10.17.18.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Apr 2025 17:18:08 -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 D55D3340971; Thu, 10 Apr 2025 18:18:07 -0600 (MDT) Received: by dev-ushankar.dev.purestorage.com (Postfix, from userid 1557716368) id D3145E40E5F; Thu, 10 Apr 2025 18:18:07 -0600 (MDT) From: Uday Shankar Date: Thu, 10 Apr 2025 18:17:50 -0600 Subject: [PATCH v3 1/2] ublk: properly serialize all FETCH_REQs Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250410-ublk_task_per_io-v3-1-b811e8f4554a@purestorage.com> References: <20250410-ublk_task_per_io-v3-0-b811e8f4554a@purestorage.com> In-Reply-To: <20250410-ublk_task_per_io-v3-0-b811e8f4554a@purestorage.com> To: Ming Lei , Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Uday Shankar , Caleb Sander Mateos X-Mailer: b4 0.14.2 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 uring_cmds against that queue. However, this mechanism does not work for FETCH_REQs, since they are expected before ubq_daemon is set. Since FETCH_REQs are only used at initialization and not in the fast path, serialize them using the per-ublk-device mutex. This fixes a number of data races that were previously possible if a badly behaved ublk server decided to issue multiple FETCH_REQs against the same qid/tag concurrently. Reported-by: Caleb Sander Mateos Signed-off-by: Uday Shankar Reviewed-by: Ming Lei --- drivers/block/ublk_drv.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index 2fd05c1bd30b03343cb6f357f8c08dd92ff47af9..812789f58704cece9b661713cd0107807c789531 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -1809,8 +1809,8 @@ static void ublk_nosrv_work(struct work_struct *work) /* device can only be started after all IOs are ready */ static void ublk_mark_io_ready(struct ublk_device *ub, struct ublk_queue *ubq) + __must_hold(&ub->mutex) { - mutex_lock(&ub->mutex); ubq->nr_io_ready++; if (ublk_queue_ready(ubq)) { ubq->ubq_daemon = current; @@ -1822,7 +1822,6 @@ static void ublk_mark_io_ready(struct ublk_device *ub, struct ublk_queue *ubq) } if (ub->nr_queues_ready == ub->dev_info.nr_hw_queues) complete_all(&ub->completion); - mutex_unlock(&ub->mutex); } static void ublk_handle_need_get_data(struct ublk_device *ub, int q_id, @@ -1962,17 +1961,25 @@ 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); case UBLK_IO_FETCH_REQ: + mutex_lock(&ub->mutex); /* UBLK_IO_FETCH_REQ is only allowed before queue is setup */ if (ublk_queue_ready(ubq)) { ret = -EBUSY; - goto out; + goto out_unlock; } /* * The io is being handled by server, so COMMIT_RQ is expected * instead of FETCH_REQ */ if (io->flags & UBLK_IO_FLAG_OWNED_BY_SRV) - goto out; + goto out_unlock; + + /* + * Check again (with mutex held) that the I/O is not + * active - if so, someone may have already fetched it + */ + if (io->flags & UBLK_IO_FLAG_ACTIVE) + goto out_unlock; if (ublk_need_map_io(ubq)) { /* @@ -1980,15 +1987,16 @@ static int __ublk_ch_uring_cmd(struct io_uring_cmd *cmd, * DATA is not enabled */ if (!ub_cmd->addr && !ublk_need_get_data(ubq)) - goto out; + goto out_unlock; } else if (ub_cmd->addr) { /* User copy requires addr to be unset */ ret = -EINVAL; - goto out; + goto out_unlock; } ublk_fill_io_cmd(io, cmd, ub_cmd->addr); ublk_mark_io_ready(ub, ubq); + mutex_unlock(&ub->mutex); break; case UBLK_IO_COMMIT_AND_FETCH_REQ: req = blk_mq_tag_to_rq(ub->tag_set.tags[ub_cmd->q_id], tag); @@ -2028,7 +2036,9 @@ static int __ublk_ch_uring_cmd(struct io_uring_cmd *cmd, ublk_prep_cancel(cmd, issue_flags, ubq, tag); return -EIOCBQUEUED; - out: +out_unlock: + mutex_unlock(&ub->mutex); +out: pr_devel("%s: complete: cmd op %d, tag %d ret %x io_flags %x\n", __func__, cmd_op, tag, ret, io->flags); return ret; From patchwork Fri Apr 11 00:17:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uday Shankar X-Patchwork-Id: 14047378 Received: from mail-qv1-f98.google.com (mail-qv1-f98.google.com [209.85.219.98]) (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 370824C7D for ; Fri, 11 Apr 2025 00:18:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.98 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744330692; cv=none; b=FXM0T00odHv7U7Q38MRKhzlyGToOMclzhYOyo0cLcpU0gVVQgU+h8IVuh10VmwYsaOrEE+vHoAO5uooEX9K/lanATd1/Rw/cCsOr10JOZ8YD6CUk7FDmxh1523lwf2hr5jpc1AR+CCqlAJ/9kiPf3EwJR/bJsm7EnZFDynJVlXo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744330692; c=relaxed/simple; bh=IK4k1lGD7CCNY4xnB320Y/XTCPOdCqw3olOazaPdrkg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IN4UkCrLANHT+TEuqdyMxRa/0HZ6FROwbJ5SpHpVW1diL7B0+11TclQvclKJrGScrU+KAgB/BUi3oJt8NP/lyncI9YKS5mx7tdpf3JIC1xct8iFsfN8eI9PCWCIDZHofFKJhQmfcZPOfb7IALdm5qHDad7BFxZ6MqrkT3VfdI2M= 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=LKdnbbWx; arc=none smtp.client-ip=209.85.219.98 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="LKdnbbWx" Received: by mail-qv1-f98.google.com with SMTP id 6a1803df08f44-6ecfa716ec1so12715906d6.2 for ; Thu, 10 Apr 2025 17:18:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1744330689; x=1744935489; 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=qgvQIthZFVhmgzPljfOF1T4sCTIIT7CGOPWCStzc9xQ=; b=LKdnbbWxytlSOq+xhGGCUqY2nIKCWRrUHQB0XiKsH0Qo04Tjil307UdDzWtpdHkM99 0ASgx0Lguqm9SskFjUILyhcVMVOoaFnzjQW655ftVw8G3NeHUSjxsRt+KvsQ5VHCTFCQ w9cqIUMSSh9WSi2AhqBY8xUAEWNHvnkpxgktdEHiyW/eGw1uspZO22eWTjp3I9I6fmW5 YBnXOQ6JIhgCXMqVA6dX3OWotY/Gs7sVNiTQbLIETvt1fha/n+1IoQtc45tPVYR0eSf7 SS/bcLfIAiLIbVh5Xg+GZmboaJb3xAMi1ybo5QDloMMTwAE8Obtw3wp4ikB8F4xTytiE ZENA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744330689; x=1744935489; 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=qgvQIthZFVhmgzPljfOF1T4sCTIIT7CGOPWCStzc9xQ=; b=NNP0yqErtZ8NdiiYkCfHTtxWwxSGdvxGVqEDDtvt5JM+VQPoYFXUdU81b+Vy6fchYs k6m1bawpa8P556B+FoFUbRp8mxu6pLEVCTyIplNjr1dWJ9JjJ9HGTdB0SVCvIzTdQOTd n8gw25v1GqtnorDWcOnwlhw8Tj+vKdZQAE46Yo2fzvdF++6dgqUhyQENLKnM57JHjcxb 1lfvhIXcL+wpdR68uNPrNeisBJowsuSQsvfORjCIvJYid7CD6XWkWrg5FwOEu4yHt9Je Uyrj4ac4/JrlYk+4upyJ1NUK4Ez3t100IvKfr+gazLKLXUA7d02f4DFcTIgTVsxhBh07 AzGA== X-Gm-Message-State: AOJu0Yx+eSa/N6wcwsOOS9FREjBzcurnLjF1TnTxR0RVLBoW0lAsEIOi 5pynhhuaP2jHq/AJjTeYsuVEu/vkn8bfjvUhINkMIumYszVqkIwTASX+kCNtK7zQhRQ8jqb55Zv ernXlfOP4zCNn6iPJ/bRedOvTxiLzzkND X-Gm-Gg: ASbGncuukgRHcT0aN3TIEOhHgw0krM89Bt8NC1ZOpD/gkJ2Qf7z/beyiCLTbI0pV1Fi LL520roFG1OGLDFtY3+HbXNsSheKCQBnosVlZiIFP907qDXS55RR154xOzpXEhMrwZLS/VHbH/K +8qVQlhmdlN6N9MWz5tVG0vqn+ZQg48nFF3D5DBJ+BrdKgjcHwweYU6po9PkzJZRqtE8f0HVxN/ 7Hz3NkFW42BLm+wm34K9mssyz5Gl5AUMbphiEg6hlsb8eV2jEPO4hyHsFPTbNufOv0WDeQ3Phx/ MLh+jXQstwnV/Fkg9SiS1JYNK9GoTdK5sezwW/0HiPKK3w== X-Google-Smtp-Source: AGHT+IGeWr2a0BCoa4N9+ssvBkCsIBCjfDakdyq/JpQGAeKWTcWAqwthST80vBQX9DaHkzqCIUBOKFN8DRhL X-Received: by 2002:a05:6214:2481:b0:6ea:d69c:a22e with SMTP id 6a1803df08f44-6f23f119382mr11402096d6.30.1744330688974; Thu, 10 Apr 2025 17:18:08 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([208.88.159.129]) by smtp-relay.gmail.com with ESMTPS id 6a1803df08f44-6f0de95c207sm3342836d6.14.2025.04.10.17.18.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Apr 2025 17:18: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 D51223406E9; Thu, 10 Apr 2025 18:18:07 -0600 (MDT) Received: by dev-ushankar.dev.purestorage.com (Postfix, from userid 1557716368) id D9820E413A4; Thu, 10 Apr 2025 18:18:07 -0600 (MDT) From: Uday Shankar Date: Thu, 10 Apr 2025 18:17:51 -0600 Subject: [PATCH v3 2/2] 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: <20250410-ublk_task_per_io-v3-2-b811e8f4554a@purestorage.com> References: <20250410-ublk_task_per_io-v3-0-b811e8f4554a@purestorage.com> In-Reply-To: <20250410-ublk_task_per_io-v3-0-b811e8f4554a@purestorage.com> To: Ming Lei , Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Uday Shankar , Caleb Sander Mateos 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 812789f58704cece9b661713cd0107807c789531..567cd314480be6273876ff7918250efc1e1b242f 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) { @@ -1202,13 +1196,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; } @@ -1314,23 +1308,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++; @@ -1529,8 +1520,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) @@ -1646,13 +1637,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); @@ -1813,8 +1804,6 @@ static void ublk_mark_io_ready(struct ublk_device *ub, struct ublk_queue *ubq) { 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)) @@ -1928,14 +1917,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; @@ -1996,6 +1985,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); mutex_unlock(&ub->mutex); break; case UBLK_IO_COMMIT_AND_FETCH_REQ: @@ -2235,9 +2225,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)); } @@ -2928,15 +2924,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++) { @@ -2946,6 +2935,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; } } @@ -2986,7 +2979,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; @@ -3005,14 +2998,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))