From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39DB1C55185 for ; Wed, 22 Apr 2020 22:52:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 106642071C for ; Wed, 22 Apr 2020 22:52:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hXjitgiB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726362AbgDVWwY (ORCPT ); Wed, 22 Apr 2020 18:52:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39246 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1725839AbgDVWwY (ORCPT ); Wed, 22 Apr 2020 18:52:24 -0400 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05146C03C1A9; Wed, 22 Apr 2020 15:52:24 -0700 (PDT) Received: by mail-wm1-x343.google.com with SMTP id u16so4495494wmc.5; Wed, 22 Apr 2020 15:52:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:references:from:autocrypt:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=0a5U6ggzTBhJKkj3lnCxXrthjJ0PFsVQAhwvnaFSQsI=; b=hXjitgiBDm1zEMIauxjENMtdp45AP2m3ZXOiQIHi90v1+OcV94Fv4OwWHSLStwgvkH 0BOjaRyWHX67YoOnstDTuv+LwieMbHWXu88l5P06UnIiVWDP3IMQKNGSkIF4oZ96ldEE relHcGhKEc8/K5KUZPdiBH//Rds2e7hVNjM9JVVWmcS8op+diEUmZOXahLDMCDXJCywC lvreMw8k8wzjCzMZflDsGBAUvQxbWGVy/TBuRQ/wjJ+/NtFBmJSlbGFQao8HgFh3wF15 mxirOTAv+vR1e2NXC3LLmuj0HE17rl4tmgCgAw6svieTpA0JoScQjlMDCAs/tmALx6pO FCNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:autocrypt:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=0a5U6ggzTBhJKkj3lnCxXrthjJ0PFsVQAhwvnaFSQsI=; b=DC0AFGhjtYQcY4CDETfu0wzY65AoDK8FgOoVDISh2HiznR3YLyaoD/ocSu4IeZJmGU R4Oz298r6GqJ84fzFZUfbwWJvp3ZGTW32rwfwlHdd/7pMBYP7r7fkVI6BAZa7Radlhok nyGloI235X5yUrQjxEUSzC5MAWsez6AsVCuy5bi4kB0eQLrXo9FSge0r85s8HSXnAtdO XT2ABJH+voJ97X1GVl1irjgfc9fInndvuE/RGotibf6+HkaWObJPZWeZn3CnNycgbrS9 fsth1wo2REfVI6gk/P9HBkSayJMeRCVtJlNkWOh/61O5gaD+LSU9s0F+Jyv+N4Mr4snX tx7Q== X-Gm-Message-State: AGi0PuZVtZw7aUnISHhmjfgg9cCBLAu2/GxBG57hFWbIBVNqLT6siiMx grBp0Hnv0fumFDpHhdaguQKxb7fy X-Google-Smtp-Source: APiQypKwMWFRikXiouBWrMK1xvkZcGGYtXUrIdMULAMsLh2jF8lcm+Wr63vDsB4I5cYzESTIw/Jytw== X-Received: by 2002:a1c:7c13:: with SMTP id x19mr777465wmc.124.1587595941596; Wed, 22 Apr 2020 15:52:21 -0700 (PDT) Received: from [192.168.43.25] ([109.126.129.227]) by smtp.gmail.com with ESMTPSA id n6sm942038wrs.81.2020.04.22.15.52.20 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 22 Apr 2020 15:52:21 -0700 (PDT) Subject: Re: [PATCH 1/2] io_uring: trigger timeout after any sqe->off CQEs To: Jens Axboe , io-uring@vger.kernel.org, linux-kernel@vger.kernel.org References: <28005ea0de63e15dbffd87a49fe9b671f1afa87e.1587229607.git.asml.silence@gmail.com> <88cbde3c-52a1-7fb3-c4a7-b548beaa5502@kernel.dk> <3fe32d07-10e6-4a5a-1390-f03ec4a09c6f@gmail.com> From: Pavel Begunkov Autocrypt: addr=asml.silence@gmail.com; prefer-encrypt=mutual; keydata= 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 bA== Message-ID: <0891010c-6b4b-1efa-a9c0-2e416138edeb@gmail.com> Date: Thu, 23 Apr 2020 01:51:20 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.3.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: io-uring-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org On 23/04/2020 01:23, Jens Axboe wrote: > On 4/22/20 4:20 PM, Pavel Begunkov wrote: >> On 20/04/2020 23:15, Pavel Begunkov wrote: >>> On 20/04/2020 23:12, Pavel Begunkov wrote: >>>> On 20/04/2020 22:40, Jens Axboe wrote: >>>>> On 4/18/20 11:20 AM, Pavel Begunkov wrote: >>>>>> +static void __io_flush_timeouts(struct io_ring_ctx *ctx) >>>>>> +{ >>>>>> + u32 end, start; >>>>>> + >>>>>> + start = end = ctx->cached_cq_tail; >>>>>> + do { >>>>>> + struct io_kiocb *req = list_first_entry(&ctx->timeout_list, >>>>>> + struct io_kiocb, list); >>>>>> + >>>>>> + if (req->flags & REQ_F_TIMEOUT_NOSEQ) >>>>>> + break; >>>>>> + /* >>>>>> + * multiple timeouts may have the same target, >>>>>> + * check that @req is in [first_tail, cur_tail] >>>>>> + */ >>>>>> + if (!io_check_in_range(req->timeout.target_cq, start, end)) >>>>>> + break; >>>>>> + >>>>>> + list_del_init(&req->list); >>>>>> + io_kill_timeout(req); >>>>>> + end = ctx->cached_cq_tail; >>>>>> + } while (!list_empty(&ctx->timeout_list)); >>>>>> +} >>>>>> + >>>>>> static void io_commit_cqring(struct io_ring_ctx *ctx) >>>>>> { >>>>>> struct io_kiocb *req; >>>>>> >>>>>> - while ((req = io_get_timeout_req(ctx)) != NULL) >>>>>> - io_kill_timeout(req); >>>>>> + if (!list_empty(&ctx->timeout_list)) >>>>>> + __io_flush_timeouts(ctx); >>>>>> >>>>>> __io_commit_cqring(ctx); >>>>>> >>>>> >>>>> Any chance we can do this without having to iterate timeouts on the >>>>> completion path? >>>>> >>>> >>>> If you mean the one in __io_flush_timeouts(), then no, unless we forbid timeouts >>>> with identical target sequences + some extra constraints. The loop there is not >>>> new, it iterates only over timeouts, that need to be completed, and removes >>>> them. That's amortised O(1). >>> >>> We can think about adding unlock/lock, if that's what you are thinking about. >>> >>> >>>> On the other hand, there was a loop in io_timeout_fn() doing in >>>> total O(n^2), and it was killed by this patch. >>> >> >> Any thoughts on this? >> >> I'll return fixing the last timeout bug I saw, but I'd prefer to know >> on top of what to do that. > > I think it's fine, but also likely something that we should defer to > 5.8. So if there are minor fixes to be done for 5.7, it should be > arranged as such. Right, totally agree -- Pavel Begunkov