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.8 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 EE445C433DF for ; Fri, 24 Jul 2020 12:48:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C525920714 for ; Fri, 24 Jul 2020 12:48:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Dgz/+nDE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726366AbgGXMsL (ORCPT ); Fri, 24 Jul 2020 08:48:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726280AbgGXMsL (ORCPT ); Fri, 24 Jul 2020 08:48:11 -0400 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A6008C0619D3 for ; Fri, 24 Jul 2020 05:48:10 -0700 (PDT) Received: by mail-ej1-x62a.google.com with SMTP id l4so9804117ejd.13 for ; Fri, 24 Jul 2020 05:48:10 -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=a5YIsDfD2FQohOlldSDvwVAGf5dQceF3fXWIqPJ5J3A=; b=Dgz/+nDENUG/aSu5SaILanIWe9jhe6OzdF+DBMarMbpGpy1ucW0fTsIbVPbNuGzY4h KAouZEZ8cNSpkHpu55VDLGj7K3bNLyhgF/N88/A9QMzvuHkbDMfNukVmhZwSaiZmXaHw sRm4YAtWml0iQ7NiucSR/Kr1599scVhEcl7lL1bkaIrJQ5Vix8vOi7j6/3GDT5w5kHv4 dFxipA6vh2w97VM8Zh/maNHCgD9E5CUIqMcMx9PEDT/izXVALN9Z/4Aj6d0QkOSy8ezV mZrgXGjMCaSTGvymZUaxDvBKlGUmNV268ouzYogA7+LSTs0P5bZ1SZ8LTcxGmJhFb14I chJw== 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=a5YIsDfD2FQohOlldSDvwVAGf5dQceF3fXWIqPJ5J3A=; b=IgkZmXL2BmIKfK0mcW7cofGJoCb3Eubqbm+bdbcSpIEzb2qxZQYWieUrTw7T7FWkc6 CUEQOAbeHrDaZ9In6wrlGmCftabu+ebaERPTVtLPCuaK4hXx5xTl55EXjygBDJAASiWK NBc/2XP3iEwmVBVhK7cY/f22NMGdfun60W0IKDYmTYJNvnBpGnt2rMBoC4QPe51CQqbi tnCUsA0n83j/k3zdtf3XMPZ6pSeXxLAbIetA4/2D+mBBpM9zFJZHcbgIta0jq985AJg8 5KCiUtUL2eGCF+uMLGfGoIdceLYPSa0sgOItVwgWaMK5JgusmQn9uL9CxhY2MDvlfNfM d2fw== X-Gm-Message-State: AOAM531qbnVkPxWuTdFn3R3d+fs3/eWvhiFMlT22VFx7h7Z6sndpAWN/ npUpjHaUT1Onp6RMAY9pUZMMi4sF X-Google-Smtp-Source: ABdhPJxnRq5T95pqABNFp8WxNfGUfEsxM7HMJg3UDFU6O4wmvQyChYXoZ3p3ZxZ/tjnBVyVLF8DWUw== X-Received: by 2002:a17:906:240d:: with SMTP id z13mr8889859eja.346.1595594889042; Fri, 24 Jul 2020 05:48:09 -0700 (PDT) Received: from [192.168.43.57] ([5.100.193.69]) by smtp.gmail.com with ESMTPSA id fx16sm615336ejb.9.2020.07.24.05.48.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 24 Jul 2020 05:48:08 -0700 (PDT) To: Jens Axboe , io-uring@vger.kernel.org References: <57971720-992a-593c-dc3e-9f5fe8c76f1f@kernel.dk> <0c52fec1-48a3-f9fe-0d35-adf6da600c2c@kernel.dk> From: Pavel Begunkov Autocrypt: addr=asml.silence@gmail.com; prefer-encrypt=mutual; keydata= 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 bA== Subject: Re: [RFC][BUG] io_uring: fix work corruption for poll_add Message-ID: Date: Fri, 24 Jul 2020 15:46:15 +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: <0c52fec1-48a3-f9fe-0d35-adf6da600c2c@kernel.dk> 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 24/07/2020 01:24, Jens Axboe wrote: > On 7/23/20 4:16 PM, Jens Axboe wrote: >> On 7/23/20 12:12 PM, Pavel Begunkov wrote: >>> poll_add can have req->work initialised, which will be overwritten in >>> __io_arm_poll_handler() because of the union. Luckily, hash_node is >>> zeroed in the end, so the damage is limited to lost put for work.creds, >>> and probably corrupted work.list. >>> >>> That's the easiest and really dirty fix, which rearranges members in the >>> union, arm_poll*() modifies and zeroes only work.files and work.mm, >>> which are never taken for poll add. >>> note: io_kiocb is exactly 4 cachelines now. >> >> I don't think there's a way around moving task_work out, just like it +hash_node. I was thinking to do apoll alloc+memcpy as for rw, but this one is ugly. >> was done on 5.9. The problem is that we could put the environment bits >> before doing task_work_add(), but we might need them if the subsequent >> queue ends up having to go async. So there's really no know when we can >> put them, outside of when the request finishes. Hence, we are kind of >> SOL here. > > Actually, if we do go async, then we can just grab the environment > again. We're in the same task at that point. So maybe it'd be better to > work on ensuring that the request is either in the valid work state, or > empty work if using task_work. > > Only potential complication with that is doing io_req_work_drop_env() > from the waitqueue handler, at least the ->needs_fs part won't like that > too much. Considering that work->list is removed before executing io_wq_work, it should work. And if done only for poll_add, which needs nothing and ends up with creds, there shouldn't be any problems. I'll try this out -- Pavel Begunkov