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.2 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 22381C433ED for ; Fri, 16 Apr 2021 13:29:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F16A461107 for ; Fri, 16 Apr 2021 13:29:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243904AbhDPNaV (ORCPT ); Fri, 16 Apr 2021 09:30:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243857AbhDPNaU (ORCPT ); Fri, 16 Apr 2021 09:30:20 -0400 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D036C061756 for ; Fri, 16 Apr 2021 06:29:56 -0700 (PDT) Received: by mail-wm1-x32d.google.com with SMTP id o21-20020a1c4d150000b029012e52898006so4576294wmh.0 for ; Fri, 16 Apr 2021 06:29:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:references:from:autocrypt:subject:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=5Ow0E+QN/JJr1BSXgIVj405CMC+LwmFnq5fgVg00MD8=; b=k7Dg/N/Ep6y/VQgW502MAW3hVl0GQ/qglZfIKllRHT/I+uRNwNpJPPKr6YGBlPhHAf M/E1D9E69p4h77fi164lg/6x6XtuJGbTZdj0yVe9g0NVyA1CuW9QHpIbxkyu7r63QLO8 HNe4f9WTaJdgdwE+cChidNYODzXqrFpWjsrWlItLeG3UWYhbElMB0I5Qi/vnJSeWoiMB IftALNodRipDLLqThvETFEZK2Eoz8Dpf/i5f2RcZDnHy8w6jyNKMACmCSSPju5guWj2s RLaUi2cQdC/tufb4XHe0VyCPQiI9QnyG2eFxs7WO4c0aRRQnu6pK1UYDSuIotkgeuqpf 5uhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:references:from:autocrypt:subject:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=5Ow0E+QN/JJr1BSXgIVj405CMC+LwmFnq5fgVg00MD8=; b=rCRqO3Rs8afCw+HQJzPfcuEJ4Y1G2P2AXuvrlJdCkxPzZFZiFGEoxC2gVgl5vr2h7s Rn8OpufNSBSoZMSFkfEunCio0uHPRib3aipR/bkU6jKS7HQw7RrXdEGasYJwOKs6gPBs gxfFNv4e/RzepTzBen92oI/Z6WxOLzo1fm8g7i75TMU/J1pwKJLnl9boZB+WNW+mt7xe 78dn8x52gqTpnwIBjXqbdwTcutMGpud3QW7lcQ/3deeu9N/JfpKqrE4JbeGSHrqHi6l4 F2UjuCBhzunYWtWkX2cnGOMRXTbw9JTTi7IjPwStdN4tCfJzLTW9hmT1pk6FgoFYU4pd Jj2g== X-Gm-Message-State: AOAM531XxINvjpFe8Ehy9clcLC15oh8hgTjBkX9feRo1x2vBTK7cssSb Qwtqve9zKMzTcgSOoI6HdLj9FmjdbI1W4g== X-Google-Smtp-Source: ABdhPJxrBC7jUuZYz7a+EPFaNGhoxIw+F+eWH7piAeiA9OKeMD3MG5rlkvmwojPLaD6lN6COize1ew== X-Received: by 2002:a05:600c:21c2:: with SMTP id x2mr8206661wmj.161.1618579794660; Fri, 16 Apr 2021 06:29:54 -0700 (PDT) Received: from [192.168.8.191] ([148.252.132.77]) by smtp.gmail.com with ESMTPSA id h8sm5172181wmq.19.2021.04.16.06.29.53 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 16 Apr 2021 06:29:54 -0700 (PDT) To: Jens Axboe , io-uring@vger.kernel.org References: <20210416012523.724073-1-axboe@kernel.dk> <20210416012523.724073-3-axboe@kernel.dk> From: Pavel Begunkov Autocrypt: addr=asml.silence@gmail.com; prefer-encrypt=mutual; keydata= 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 bA== Subject: Re: [PATCH 2/3] io_uring: put flag checking for needing req cleanup in one spot Message-ID: <82666c0c-fad4-05b7-5af7-5c3dbe879c8c@gmail.com> Date: Fri, 16 Apr 2021 14:25: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: <20210416012523.724073-3-axboe@kernel.dk> 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 16/04/2021 02:25, Jens Axboe wrote: > We have this in two spots right now, which is a bit fragile. In > preparation for moving REQ_F_POLLED cleanup into the same spot, move > the check into io_clean_op() itself so we only have it once. > > Signed-off-by: Jens Axboe > --- > fs/io_uring.c | 19 ++++++++----------- > 1 file changed, 8 insertions(+), 11 deletions(-) > > diff --git a/fs/io_uring.c b/fs/io_uring.c > index 87ce3dbcd4ca..a668d6a3319c 100644 > --- a/fs/io_uring.c > +++ b/fs/io_uring.c > @@ -1601,8 +1601,7 @@ static void io_req_complete_post(struct io_kiocb *req, long res, > static void io_req_complete_state(struct io_kiocb *req, long res, > unsigned int cflags) > { > - if (req->flags & (REQ_F_NEED_CLEANUP | REQ_F_BUFFER_SELECTED)) > - io_clean_op(req); > + io_clean_op(req); > req->result = res; > req->compl.cflags = cflags; > req->flags |= REQ_F_COMPLETE_INLINE; > @@ -1713,16 +1712,12 @@ static void io_dismantle_req(struct io_kiocb *req) > > if (!(flags & REQ_F_FIXED_FILE)) > io_put_file(req->file); > - if (flags & (REQ_F_NEED_CLEANUP | REQ_F_BUFFER_SELECTED | > - REQ_F_INFLIGHT)) { > - io_clean_op(req); > + io_clean_op(req); > + if (req->flags & REQ_F_INFLIGHT) { > + struct io_uring_task *tctx = req->task->io_uring; Not in particular happy about it. 1. adds extra if 2. adds extra function call 3. extra memory load in that function call. Pushes us back in terms of performance. I'd suggest to have a helper, which is pretty much optimisable and may be coalesced by a compiler with adjacent flag checks. static inline bool io_need_cleanup(unsigned flags) { return flags & (REQ_F_NEED_CLEANUP | REQ_F_BUFFER_SELECTED); } if (io_need_cleanup(flags) || (flags & INFLIGHT)) { io_clean_op(); if (INFLIGHT) {} } > > - if (req->flags & REQ_F_INFLIGHT) { > - struct io_uring_task *tctx = req->task->io_uring; > - > - atomic_dec(&tctx->inflight_tracked); > - req->flags &= ~REQ_F_INFLIGHT; > - } > + atomic_dec(&tctx->inflight_tracked); > + req->flags &= ~REQ_F_INFLIGHT; > } > if (req->fixed_rsrc_refs) > percpu_ref_put(req->fixed_rsrc_refs); > @@ -5995,6 +5990,8 @@ static int io_req_defer(struct io_kiocb *req) > > static void io_clean_op(struct io_kiocb *req) > { > + if (!(req->flags & (REQ_F_BUFFER_SELECTED | REQ_F_NEED_CLEANUP))) > + return; > if (req->flags & REQ_F_BUFFER_SELECTED) { > switch (req->opcode) { > case IORING_OP_READV: > -- Pavel Begunkov