Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp729652ybt; Fri, 19 Jun 2020 12:11:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxLcvu3+bc7kvJq+GHBMzbTegeIDyXbXhIgNxPnrqoFERH4S6Rueih9nyqAOtS7gzvMtgW5 X-Received: by 2002:a05:6402:1481:: with SMTP id e1mr4856573edv.113.1592593905220; Fri, 19 Jun 2020 12:11:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592593905; cv=none; d=google.com; s=arc-20160816; b=0PnY9yJjROrYm2NjX/hBbo59cS+WvGlVvSS/tu8tN659BKiPOoBbBf2cR2XIJtE6Kv 2uUlBqD8n0TUEjMeDBfuHe5Pcx8jKZdhwph6q6Xu4Bs3eQ7Q8WMrEm4x975Me8nDj33i cX0vtPovr/zAzbZA+rMlacXnMJol8mBY3HRSvVlgEeud+T/eZdGGvpd7HwChOVbAudgF K7bkVtUD5pg21EPAHdVfGAogqg938A36Ope62hcSDPClqEzgYfGJY0EYgi3kh/TwqXXI S+RaEKanuB3ACH2GfaaShURWQim7/K2jq326btg5UdeA6PGcJFGjig1voz0kRPt58Del hzgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject:dkim-signature; bh=vxtHFfxRa6J52mPRG6jvgbvliKZllqWnNgXrzGwwQhE=; b=G0McZ+h/Ct1V+X5Y4gMLxzOEKj3Qvlbnt5E+qNYIRLcqbWH1HawSPRJPR7kLiPWh0z Wqr7HtiOH65US1bOBx0N/HLx+5eklTv4W6GRdVyxr/4nFxmz29qpnvoB5osRLwaVQBGY ITvdiS75lRDKCgYgGLb7xXgkk0GM6eHnAa83M8vIX/lXW7VeCV03VvqYpvR21WPsk+Yc v7grc+rTtoERtNJ+gh7uTb0r9nkGspYZM73gJTcnUdftlXao6uakH0GdqzP2cFN+aC6C 9jLeHZdEe1XXDDyCjOy3q7DBhW661Q0YfQbJ76Vnvb973ENcPHDOsx4YKWxRd4hZ+ljU luGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20150623.gappssmtp.com header.s=20150623 header.b=FHU640Pi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n24si4790468edb.277.2020.06.19.12.11.22; Fri, 19 Jun 2020 12:11:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel-dk.20150623.gappssmtp.com header.s=20150623 header.b=FHU640Pi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732728AbgFSOWb (ORCPT + 99 others); Fri, 19 Jun 2020 10:22:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49806 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727081AbgFSOWZ (ORCPT ); Fri, 19 Jun 2020 10:22:25 -0400 Received: from mail-pg1-x543.google.com (mail-pg1-x543.google.com [IPv6:2607:f8b0:4864:20::543]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE012C0613EE for ; Fri, 19 Jun 2020 07:22:24 -0700 (PDT) Received: by mail-pg1-x543.google.com with SMTP id l24so4560685pgb.5 for ; Fri, 19 Jun 2020 07:22:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=vxtHFfxRa6J52mPRG6jvgbvliKZllqWnNgXrzGwwQhE=; b=FHU640PiXW0xLyp6AL1PCI7tRK5wZ06ZcDtLoY1aP2MLtQLYA/U8l9u+b9wpPYqO6A rKlg/ouC1alQwarF28E0DQZ1SJXWsrDrDUYLSjHv95gzOTS88oBzZ0IP7kYuLRe4dEpU K51/lr0hGhn6/egk9YmTp7T1VdLVAlWt3OFSjyKaAMn7Ld7iL3gdHOiFXMm/AJFzUHfu wfMLS9RtdrGdqp76or0DL9iuXL2SBwqm/1H76EveVh8A5a/g6wllP0xfgCSEi5teRCjP SPRU9LwxkuNVMzFCC3C33qwzViJCT+14F747rhVJ9n+i2CVu4EK2i39GuuwIMefZN7za ESGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=vxtHFfxRa6J52mPRG6jvgbvliKZllqWnNgXrzGwwQhE=; b=EN0ULgPD9bTaXl78R/ztFjMs9OS9DrtJTOS+PsPoLQ7UaqowT38lu69Q2OCtIG+W1x Xq7nSuI9EcEo4f1pQLFsNwgge99gYZ555OIwzs1Ts3GAWU2xachCLhD7L/Y6u626ioB0 FIs3H1YK69v//BWrFP5NsrsabtUuxCMF1ayG8xTmEUt7XNezEz6Vdx0oIpr0aS3dxfgA wsEnukIDlSXssLllKsxZcem4dMEjN08KQaj9vBj4GL01yk6pWLIaGvohaP3+gR1TpEU5 wL6Yd//cV7u3/POJSyjhfSoq77ocBirRv4dp5815LmkNJ/N4gJO3aZ46P1g7+EGVEemj XrZw== X-Gm-Message-State: AOAM530q+EqxTs+0VCGYQ2zUQgdDcgGYWhCTAbBV65h/PlMSSQ2aSrXx BXLnRo6zSQAFn1O/iQGdMdYvcA== X-Received: by 2002:a65:43cb:: with SMTP id n11mr3240011pgp.160.1592576544118; Fri, 19 Jun 2020 07:22:24 -0700 (PDT) Received: from [192.168.1.188] ([66.219.217.173]) by smtp.gmail.com with ESMTPSA id p11sm6265486pfq.10.2020.06.19.07.22.22 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Jun 2020 07:22:23 -0700 (PDT) Subject: Re: [PATCH 04/15] io_uring: re-issue block requests that failed because of resources To: Pavel Begunkov , io-uring@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, akpm@linux-foundation.org References: <20200618144355.17324-1-axboe@kernel.dk> <20200618144355.17324-5-axboe@kernel.dk> From: Jens Axboe Message-ID: Date: Fri, 19 Jun 2020 08:22:22 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 6/19/20 8:12 AM, Pavel Begunkov wrote: > On 18/06/2020 17:43, Jens Axboe wrote: >> Mark the plug with nowait == true, which will cause requests to avoid >> blocking on request allocation. If they do, we catch them and reissue >> them from a task_work based handler. >> >> Normally we can catch -EAGAIN directly, but the hard case is for split >> requests. As an example, the application issues a 512KB request. The >> block core will split this into 128KB if that's the max size for the >> device. The first request issues just fine, but we run into -EAGAIN for >> some latter splits for the same request. As the bio is split, we don't >> get to see the -EAGAIN until one of the actual reads complete, and hence >> we cannot handle it inline as part of submission. >> >> This does potentially cause re-reads of parts of the range, as the whole >> request is reissued. There's currently no better way to handle this. >> >> Signed-off-by: Jens Axboe >> --- >> fs/io_uring.c | 148 ++++++++++++++++++++++++++++++++++++++++++-------- >> 1 file changed, 124 insertions(+), 24 deletions(-) >> >> diff --git a/fs/io_uring.c b/fs/io_uring.c >> index 2e257c5a1866..40413fb9d07b 100644 >> --- a/fs/io_uring.c >> +++ b/fs/io_uring.c >> @@ -900,6 +900,13 @@ static int io_file_get(struct io_submit_state *state, struct io_kiocb *req, >> static void __io_queue_sqe(struct io_kiocb *req, >> const struct io_uring_sqe *sqe); >> > ...> + >> +static void io_rw_resubmit(struct callback_head *cb) >> +{ >> + struct io_kiocb *req = container_of(cb, struct io_kiocb, task_work); >> + struct io_ring_ctx *ctx = req->ctx; >> + int err; >> + >> + __set_current_state(TASK_RUNNING); >> + >> + err = io_sq_thread_acquire_mm(ctx, req); >> + >> + if (io_resubmit_prep(req, err)) { >> + refcount_inc(&req->refs); >> + io_queue_async_work(req); >> + } > > Hmm, I have similar stuff but for iopoll. On top removing grab_env* for > linked reqs and some extra. I think I'll rebase on top of this. Yes, there's certainly overlap there. I consider this series basically wrapped up, so feel free to just base on top of it. >> +static bool io_rw_reissue(struct io_kiocb *req, long res) >> +{ >> +#ifdef CONFIG_BLOCK >> + struct task_struct *tsk; >> + int ret; >> + >> + if ((res != -EAGAIN && res != -EOPNOTSUPP) || io_wq_current_is_worker()) >> + return false; >> + >> + tsk = req->task; >> + init_task_work(&req->task_work, io_rw_resubmit); >> + ret = task_work_add(tsk, &req->task_work, true); > > I don't like that the request becomes un-discoverable for cancellation > awhile sitting in the task_work list. Poll stuff at least have hash_node > for that. Async buffered IO was never cancelable, so it doesn't really matter. It's tied to the task, so we know it'll get executed - either run, or canceled if the task is going away. This is really not that different from having the work discoverable through io-wq queueing before, since the latter could never be canceled anyway as it sits there uninterruptibly waiting for IO completion. -- Jens Axboe