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=-5.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A,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 92D3FC388F7 for ; Sun, 25 Oct 2020 19:57:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4169F2225B for ; Sun, 25 Oct 2020 19:57:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CSh3mAUc" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1418652AbgJYT5s (ORCPT ); Sun, 25 Oct 2020 15:57:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1418648AbgJYT5s (ORCPT ); Sun, 25 Oct 2020 15:57:48 -0400 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C291C061755; Sun, 25 Oct 2020 12:57:46 -0700 (PDT) Received: by mail-wm1-x344.google.com with SMTP id 13so9707018wmf.0; Sun, 25 Oct 2020 12:57:46 -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=KBP9DtCbZhT76AOjImcbdmGVLrlqR9ALs3zcWv9Si9g=; b=CSh3mAUcsKNeiIAQ25b/oX4DnKrs10zXVzXWhcHWU7YdSf7EjoVS4r6GHTTi7MVmqM sU7ph47ahrO47NzxQE8BWmNwHxZ/JC62zV+aR6oTFjgD6U4RuNwjZ7XzAvj/WIXjzqWH QyvTTb9DepJ9KrunJvpuubvOaoGPpLmnHEHDLpm4IBKhFRnv+e14DFVp0yKw9rrhm9kv lim7tUAv/Lg1i5eKdLd8h/WZNmuWdYVghfrrNiYWsQthC+4yK3VXx04PSBC3AnGLRIfO 15+TyXfKzX5x7yij7mLpnYhlqh/aNSDXYHjjxZWz7CrDWQzY1E/CI8UVLRYCLJ/X2xkm mKSA== 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=KBP9DtCbZhT76AOjImcbdmGVLrlqR9ALs3zcWv9Si9g=; b=kym7m25T5hIxyfdmlGd3qwhXxk4mPVnB+/byN7J6ydxEsCko9RBdB+QZasTD7yZhge PdIMfNuKyokZnNiq8e8vvHlrigB018BI8d+2B7cbyzeMqeqCC3RM95u/bpkQQsHVzdy5 i4zqgZm9BYtqWsI6iaBN5QvS5KwFyQyM42Sqn6PVfWgoauDVvqypVxOscbZFamXN2sTM 5lguI8CUS+qu09To8vtWDff149rhdGqvLZGaZ4FUXEt4skMSaRH0FL0ebKlEzV9Lemkd ipl58XemOHQ+VVsNQ5FJrJqxriRyWyPFqqdCwiCR1YdLos9m3/zcJmf64BZtprq4OGx9 5EXw== X-Gm-Message-State: AOAM531Otfry7+/VcoNGik00nyJ+yNZW6w6bx9clDGmVRrgK6Kfk/Njl FZC//Er4xkEwnrKZaNG9k9/MIMK2YcEsHA== X-Google-Smtp-Source: ABdhPJxoSrrNBUF0knvBkA3i/Gb/7BecMjJkjmI5Bct3sW/0TQiaP/mrRyWaW8yhFNViqHTk5MPypA== X-Received: by 2002:a1c:b707:: with SMTP id h7mr13507320wmf.105.1603655864701; Sun, 25 Oct 2020 12:57:44 -0700 (PDT) Received: from [192.168.1.159] (host109-152-100-228.range109-152.btcentralplus.com. [109.152.100.228]) by smtp.gmail.com with ESMTPSA id x65sm18621967wmg.1.2020.10.25.12.57.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 25 Oct 2020 12:57:44 -0700 (PDT) To: Jens Axboe , io-uring@vger.kernel.org Cc: stable@vger.kernel.org References: <1bf1093730a68f8939bfd7e6747add7af37ad321.1603635991.git.asml.silence@gmail.com> <1ea94ec7-d80a-527b-5366-b91815496f4a@kernel.dk> <2022677d-6783-468d-6e77-43208a91edba@gmail.com> <83e9fd0e-9136-0ca7-5eb9-01f8da6bd212@kernel.dk> <94e07136-2be5-2981-79ae-d4f714803143@gmail.com> <923cecfe-6d0e-515f-3237-99884053b7f0@gmail.com> <07ce7445-e4bf-b8f0-b666-51730ec1ef80@kernel.dk> From: Pavel Begunkov Autocrypt: addr=asml.silence@gmail.com; prefer-encrypt=mutual; keydata= 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 bA== Subject: Re: [PATCH] io_uring: fix invalid handler for double apoll Message-ID: <7f453b21-f0a2-88c5-a73e-02a9f52b7387@gmail.com> Date: Sun, 25 Oct 2020 19:54:47 +0000 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: <07ce7445-e4bf-b8f0-b666-51730ec1ef80@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 25/10/2020 19:44, Jens Axboe wrote: > On 10/25/20 1:32 PM, Pavel Begunkov wrote: >> On 25/10/2020 19:18, Jens Axboe wrote: >>> On 10/25/20 1:01 PM, Pavel Begunkov wrote: >>>> On 25/10/2020 18:42, Jens Axboe wrote: >>>>> On 10/25/20 10:24 AM, Pavel Begunkov wrote: >>>>>> On 25/10/2020 15:53, Jens Axboe wrote: >>>>>>> On 10/25/20 8:26 AM, Pavel Begunkov wrote: >>>>>>>> io_poll_double_wake() is called for both: poll requests and as apoll >>>>>>>> (internal poll to make rw and other requests), hence when it calls >>>>>>>> __io_async_wake() it should use a right callback depending on the >>>>>>>> current poll type. >>>>>>> >>>>>>> Can we do something like this instead? Untested... >>>>>> >>>>>> It should work, but looks less comprehensible. Though, it'll need >>>>> >>>>> Not sure I agree, with a comment it'd be nicer im ho: >>>> >>>> I don't really care enough to start a bikeshedding, let's get yours >>>> tested and merged. >>> >>> Not really bikeshedding I think, we're not debating names of >>> functions :-) >> >> It's just not so important, and it even may get removed in a month, >> who knows. > > Well it might not or it might take longer, still nice to have the > simplest fix... Ok, then TLDR: my reasoning is that with poll->wait.func(), a person who reads it needs to a) go look up what's poll (assigned depending on the opcode), b) then find out which wait.func callback it set. And it's not as easy to associate __io_arm_poll_handler() call sites with cases if you haven't seen this code before. c) then go through io_{async,poll}_wake to finally find out that they do almost the same thing, that's calling __io_async_wake(). I'm familiar with the code structure, but IMHO it's harder to understand, if I'd be looking for the first time. > >>> My approach would need conditional clearing of ->private as well, >>> as far as I can tell. I'll give it a spin. >> >> Maybe >> >> - poll->wait.func(wait, mode, sync, key); >> + poll->wait.func(&poll->wait, mode, sync, key); > > Ah yeah, that looks better. > -- Pavel Begunkov