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=-10.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,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 23E09C43460 for ; Mon, 12 Apr 2021 12:39:54 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 775296128C for ; Mon, 12 Apr 2021 12:39:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 775296128C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id C3AF06B0036; Mon, 12 Apr 2021 08:39:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BEBCE6B006C; Mon, 12 Apr 2021 08:39:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A65D16B006E; Mon, 12 Apr 2021 08:39:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0032.hostedemail.com [216.40.44.32]) by kanga.kvack.org (Postfix) with ESMTP id 8766D6B0036 for ; Mon, 12 Apr 2021 08:39:52 -0400 (EDT) Received: from smtpin38.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 3FDFD180AD82F for ; Mon, 12 Apr 2021 12:39:52 +0000 (UTC) X-FDA: 78023671824.38.A435189 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by imf11.hostedemail.com (Postfix) with ESMTP id 8EF8E200024C for ; Mon, 12 Apr 2021 12:39:43 +0000 (UTC) Received: by mail-pl1-f173.google.com with SMTP id 20so2337151pll.7 for ; Mon, 12 Apr 2021 05:39:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-language:content-transfer-encoding; bh=gr77k9QIz5RgOpRuocDvfRh6v9EnFR0pe6j1Y5IYB2c=; b=0lVDWVm2c4P6uDnoiat392Tzm+7LBnyUzpU5Wt2kYXqlKQqRgnzzkcPBZ5bC96fT53 WaC89SsJzCZZlw3XjnaoKp9POAJNaMWypeUhMOUXE6UwNf5evSUhXjINsGpDJEsjykpG tK4/+emmLri02KKDgdDuT/vFBXZWYc/QRWd3pdGijKa7waLuYw8wMsXeioTJJ9vf+gKk EU/AOtNsPQVpQ9z+yJFvwQeN7OqAdRPMdVwxGqMSFL0IYWthX8FUVd2Uh+qCj6KDvHDk aOFih1e0kXItsRoYXmJ/gIdqXF8JkybU1sEja7r93RvLioldEwYsJPIr+K0xBciiDb4e 53NA== 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:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=gr77k9QIz5RgOpRuocDvfRh6v9EnFR0pe6j1Y5IYB2c=; b=BWCXQ7t4NKXLDzTM4g1mKMWn4prVrQnN2EVLTSGjhy5DvtHNp94B2+Re+6Fktnnu/j /KoamfBpUJCqwT7Bd8lGuhuVAwkbJAPTTsOshQzlmglLeiyOIzWzrktLcWJ4vf1ghfT3 eGYH6JcA4jw1xHxt9P8igFyKCymiw+sr3JqdLx7CmQeea8qsQniPT2m7SM1TVSjEHJSH LYrazb4vihnv4gzjOgwxroHr5t42OWVAq3Z42hDJPHkNkYEOebjDEmPX3uwdewlW5xG5 va+RA1NG44hNIPMIiKjSzYn9VXEMOYLox4YNxIDo6lZsJYcqVrU1qZ0muMTSLwZQbRMJ bWNg== X-Gm-Message-State: AOAM532Wj4Iaepp+3y43E3+A/hSwk8CnQBz/3PwXB8hfEbUamqYopTyY jksjjyMwSgBGlw26MbVIXssdRA== X-Google-Smtp-Source: ABdhPJx6BDqLnXuiU8ZrCCZF5U8r3KW7U8g+JmBycODpTH8WyxV7HHlVa393OvPHk1gCIGIMZGhBAQ== X-Received: by 2002:a17:90a:f307:: with SMTP id ca7mr27538838pjb.80.1618231190278; Mon, 12 Apr 2021 05:39:50 -0700 (PDT) Received: from [192.168.1.134] ([66.219.217.173]) by smtp.gmail.com with ESMTPSA id a3sm10238643pjq.36.2021.04.12.05.39.49 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 12 Apr 2021 05:39:49 -0700 (PDT) Subject: Re: mmotm 2021-04-11-20-47 uploaded (fs/io_uring.c) To: Randy Dunlap , akpm@linux-foundation.org, broonie@kernel.org, mhocko@suse.cz, sfr@canb.auug.org.au, linux-next@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, mm-commits@vger.kernel.org References: <20210412034813.EK9k9%akpm@linux-foundation.org> <34ed89e1-683e-7c12-ceb0-f5b71148a8a7@infradead.org> From: Jens Axboe Message-ID: <9533afdd-208e-c25d-2e11-cc7f2c9d147b@kernel.dk> Date: Mon, 12 Apr 2021 06:39:49 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <34ed89e1-683e-7c12-ceb0-f5b71148a8a7@infradead.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US X-Stat-Signature: me4d6eej6t7nqxn1c3angjz3dkpabshf X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 8EF8E200024C Received-SPF: none (kernel.dk>: No applicable sender policy available) receiver=imf11; identity=mailfrom; envelope-from=""; helo=mail-pl1-f173.google.com; client-ip=209.85.214.173 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1618231183-631085 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On 4/12/21 1:21 AM, Randy Dunlap wrote: > On 4/11/21 8:48 PM, akpm@linux-foundation.org wrote: >> The mm-of-the-moment snapshot 2021-04-11-20-47 has been uploaded to >> >> https://www.ozlabs.org/~akpm/mmotm/ >> >> mmotm-readme.txt says >> >> README for mm-of-the-moment: >> >> https://www.ozlabs.org/~akpm/mmotm/ >> >> This is a snapshot of my -mm patch queue. Uploaded at random hopefull= y >> more than once a week. >> >> You will need quilt to apply these patches to the latest Linus release= (5.x >> or 5.x-rcY). The series file is in broken-out.tar.gz and is duplicate= d in >> https://ozlabs.org/~akpm/mmotm/series >> >> The file broken-out.tar.gz contains two datestamp files: .DATE and >> .DATE-yyyy-mm-dd-hh-mm-ss. Both contain the string yyyy-mm-dd-hh-mm-s= s, >> followed by the base kernel version against which this patch series is= to >> be applied. >> >> This tree is partially included in linux-next. To see which patches a= re >> included in linux-next, consult the `series' file. Only the patches >> within the #NEXT_PATCHES_START/#NEXT_PATCHES_END markers are included = in >> linux-next. >=20 > on i386: > # CONFIG_BLOCK is not set >=20 > ../fs/io_uring.c: In function =E2=80=98kiocb_done=E2=80=99: > ../fs/io_uring.c:2766:7: error: implicit declaration of function =E2=80= =98io_resubmit_prep=E2=80=99; did you mean =E2=80=98io_put_req=E2=80=99? = [-Werror=3Dimplicit-function-declaration] > if (io_resubmit_prep(req)) { I'll apply the below to take care of that. diff --git a/fs/io_uring.c b/fs/io_uring.c index 3a837d2b8331..aa29918944f6 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -2464,6 +2464,10 @@ static bool io_rw_should_reissue(struct io_kiocb *= req) return true; } #else +static bool io_resubmit_prep(struct io_kiocb *req) +{ + return false; +} static bool io_rw_should_reissue(struct io_kiocb *req) { return false; @@ -2504,14 +2508,8 @@ static void io_complete_rw_iopoll(struct kiocb *ki= ocb, long res, long res2) if (kiocb->ki_flags & IOCB_WRITE) kiocb_end_write(req); if (unlikely(res !=3D req->result)) { - bool fail =3D true; - -#ifdef CONFIG_BLOCK - if (res =3D=3D -EAGAIN && io_rw_should_reissue(req) && - io_resubmit_prep(req)) - fail =3D false; -#endif - if (fail) { + if (!(res =3D=3D -EAGAIN && io_rw_should_reissue(req) && + io_resubmit_prep(req))) { req_set_fail_links(req); req->flags |=3D REQ_F_DONT_REISSUE; } --=20 Jens Axboe