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=-11.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable 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 2A326C433DF for ; Tue, 11 Aug 2020 06:13:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0BB46206C3 for ; Tue, 11 Aug 2020 06:13:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726520AbgHKGNU (ORCPT ); Tue, 11 Aug 2020 02:13:20 -0400 Received: from mail106.syd.optusnet.com.au ([211.29.132.42]:37833 "EHLO mail106.syd.optusnet.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726154AbgHKGNU (ORCPT ); Tue, 11 Aug 2020 02:13:20 -0400 Received: from dread.disaster.area (pa49-180-53-24.pa.nsw.optusnet.com.au [49.180.53.24]) by mail106.syd.optusnet.com.au (Postfix) with ESMTPS id 91FE9760815; Tue, 11 Aug 2020 16:13:16 +1000 (AEST) Received: from dave by dread.disaster.area with local (Exim 4.92.3) (envelope-from ) id 1k5NX8-0002CA-9F; Tue, 11 Aug 2020 16:13:14 +1000 Date: Tue, 11 Aug 2020 16:13:14 +1000 From: Dave Chinner To: Jens Axboe Cc: linux-fsdevel , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH] fs: RWF_NOWAIT should imply IOCB_NOIO Message-ID: <20200811061314.GF2079@dread.disaster.area> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.3 cv=LPwYv6e9 c=1 sm=1 tr=0 a=moVtWZxmCkf3aAMJKIb/8g==:117 a=moVtWZxmCkf3aAMJKIb/8g==:17 a=kj9zAlcOel0A:10 a=y4yBn9ojGxQA:10 a=7-415B0cAAAA:8 a=20KFwNOVAAAA:8 a=4G0RZZJQyTIlTLWZrEUA:9 a=CjuIK1q_8ugA:10 a=biEYGPWJfzWAr4FL6Ov7:22 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On Mon, Aug 10, 2020 at 06:48:19PM -0600, Jens Axboe wrote: > With the change allowing read-ahead for IOCB_NOWAIT, we changed the > RWF_NOWAIT semantics of only doing cached reads. Since we know have > IOCB_NOIO to manage that specific side of it, just make RWF_NOWAIT > imply IOCB_NOIO as well to restore the previous behavior. > > Fixes: 2e85abf053b9 ("mm: allow read-ahead with IOCB_NOWAIT set") > Reported-by: Dave Chinner > Signed-off-by: Jens Axboe > > --- > > This was a known change with the buffered async read change, but we > didn't have IOCB_NOIO until late in 5.8. Now that bases are synced, > make the change to make RWF_NOWAIT behave like past kernels. > > diff --git a/include/linux/fs.h b/include/linux/fs.h > index bd7ec3eaeed0..f1cca4bfdd7b 100644 > --- a/include/linux/fs.h > +++ b/include/linux/fs.h > @@ -3293,7 +3293,7 @@ static inline int kiocb_set_rw_flags(struct kiocb *ki, rwf_t flags) > if (flags & RWF_NOWAIT) { > if (!(ki->ki_filp->f_mode & FMODE_NOWAIT)) > return -EOPNOTSUPP; > - kiocb_flags |= IOCB_NOWAIT; > + kiocb_flags |= IOCB_NOWAIT | IOCB_NOIO; > } > if (flags & RWF_HIPRI) > kiocb_flags |= IOCB_HIPRI; Looks good. Reviewed-by: Dave Chinner -- Dave Chinner david@fromorbit.com