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=-14.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham 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 847A7C433ED for ; Wed, 31 Mar 2021 22:11:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 340B461005 for ; Wed, 31 Mar 2021 22:11:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229812AbhCaWK7 (ORCPT ); Wed, 31 Mar 2021 18:10:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229615AbhCaWKt (ORCPT ); Wed, 31 Mar 2021 18:10:49 -0400 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92478C061574 for ; Wed, 31 Mar 2021 15:10:49 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id b2-20020a7bc2420000b029010be1081172so1868213wmj.1 for ; Wed, 31 Mar 2021 15:10:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:cc:references:from:autocrypt:subject:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=EgYBIsizi06lMbml/WyuXtgHIvtcy56Eyh1Zmkg/LUU=; b=PK7KGDjrAmCS0Wtjmaa55Uhe3wCpUXH2Ak0gwcPH7NFbZwPNaxlRG2f172msM+vII/ ALIHfLXc3xAVWIVoLHKTewc6psDSKlMS/5hICZ67qlAtGlmV/wDHGD6yNldRXzPT31pb RWQN1aJDOT7Xgi4E92q1C15VGEuEBTCHBKfCY1RsYT3uGOWhrfphn/aIfB69sgtpGg6W vZ0v/1PXxaMeHdF1D0LAY9mOdgGEX+QuldVhUuURrZ2L7zvfcHhUGm6/5/uRY2qQOrrY 3IlY9Gz3epKDSTyN57eMPdJi4sWrDxaRC027Rg3YG66mGokYSKR8SJ1OG+BfdUNo1Wi2 oerw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:references:from:autocrypt:subject :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=EgYBIsizi06lMbml/WyuXtgHIvtcy56Eyh1Zmkg/LUU=; b=mmq/J7/Wg5zHgjGAE18VmhkUZ/RzALfTyd6zhHiXIQI57iL+JxKOeI/lqgEJc1Ol23 /X7jl8wJe3aADkaz9KwXqs6wt/w1U6WIlDPbT6HOI6HAW9BXd5r+CN8yUjo9d4eFwnNQ +IOUn8LBHWJ/TCp/1CA1n4giPQyEShHbeaBoHV82MLCnnlSk5GNdsxsI5VD7j7jXJSfT 3rkBYc2zW4Vz0jhdzSxChDFczlBvPbcAXl/Esc1zro2rosSCg2OFB9jVlGm7FjSSz9hF ut+uKnc6pHjmqoAwtvz82vt0w3bBzFLGhVK44r0mv704pjNQs8jQp6/TjTkDyc6bhNMu xsQA== X-Gm-Message-State: AOAM5302pfrPfedAl7IxcjNbzkqhMaeClWY5Z+r3v3XSNJoJA8vtBwJg /Jj47Ti8tMSvstS+Jlom5KhCLVRz4NceMA== X-Google-Smtp-Source: ABdhPJyQQMksfoQTDSPLIllVqvloCO42mDxuQVWv9mRwyDteCLnZ/HyQZntqaggstPuOxKo4YFGxsA== X-Received: by 2002:a7b:c357:: with SMTP id l23mr4963716wmj.152.1617228648317; Wed, 31 Mar 2021 15:10:48 -0700 (PDT) Received: from [192.168.8.120] ([148.252.132.152]) by smtp.gmail.com with ESMTPSA id s13sm6783457wrv.80.2021.03.31.15.10.47 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 31 Mar 2021 15:10:47 -0700 (PDT) To: Hao Xu , Jens Axboe Cc: io-uring@vger.kernel.org, Joseph Qi References: <1617181262-66724-1-git-send-email-haoxu@linux.alibaba.com> From: Pavel Begunkov Autocrypt: addr=asml.silence@gmail.com; prefer-encrypt=mutual; keydata= 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 bA== Subject: Re: [PATCH for-5.13] io_uring: maintain drain requests' logic Message-ID: <55b29f0f-967d-fc91-a959-60e01acc55a3@gmail.com> Date: Wed, 31 Mar 2021 23:06:43 +0100 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: <1617181262-66724-1-git-send-email-haoxu@linux.alibaba.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org On 31/03/2021 10:01, Hao Xu wrote: > Now that we have multishot poll requests, one sqe can emit multiple > cqes. given below example: > sqe0(multishot poll)-->sqe1-->sqe2(drain req) > sqe2 is designed to issue after sqe0 and sqe1 completed, but since sqe0 > is a multishot poll request, sqe2 may be issued after sqe0's event > triggered twice before sqe1 completed. This isn't what users leverage > drain requests for. > Here a simple solution is to ignore all multishot poll cqes, which means > drain requests won't wait those request to be done. > > Signed-off-by: Hao Xu > --- > fs/io_uring.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/fs/io_uring.c b/fs/io_uring.c > index 513096759445..cd6d44cf5940 100644 > --- a/fs/io_uring.c > +++ b/fs/io_uring.c > @@ -455,6 +455,7 @@ struct io_ring_ctx { > struct callback_head *exit_task_work; > > struct wait_queue_head hash_wait; > + unsigned multishot_cqes; > > /* Keep this last, we don't need it for the fast path */ > struct work_struct exit_work; > @@ -1181,8 +1182,8 @@ static bool req_need_defer(struct io_kiocb *req, u32 seq) > if (unlikely(req->flags & REQ_F_IO_DRAIN)) { > struct io_ring_ctx *ctx = req->ctx; > > - return seq != ctx->cached_cq_tail > - + READ_ONCE(ctx->cached_cq_overflow); > + return seq + ctx->multishot_cqes != ctx->cached_cq_tail > + + READ_ONCE(ctx->cached_cq_overflow); > } > > return false; > @@ -4897,6 +4898,7 @@ static bool io_poll_complete(struct io_kiocb *req, __poll_t mask, int error) > { > struct io_ring_ctx *ctx = req->ctx; > unsigned flags = IORING_CQE_F_MORE; > + bool multishot_poll = !(req->poll.events & EPOLLONESHOT); > > if (!error && req->poll.canceled) { > error = -ECANCELED; > @@ -4911,6 +4913,9 @@ static bool io_poll_complete(struct io_kiocb *req, __poll_t mask, int error) > req->poll.done = true; > flags = 0; > } > + if (multishot_poll) > + ctx->multishot_cqes++; > + We need to make sure we do that only for a non-final complete, i.e. not killing request, otherwise it'll double account the last one. E.g. is failed __io_cqring_fill_event() in io_poll_complete() fine? Other places? Btw, we can use some tests :) > io_commit_cqring(ctx); > return !(flags & IORING_CQE_F_MORE); > } > -- Pavel Begunkov