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=-17.6 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_IN_DEF_DKIM_WL 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 6F48CC433E1 for ; Wed, 22 Jul 2020 16:27:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4C2152065F for ; Wed, 22 Jul 2020 16:27:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="ra98AzIY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726642AbgGVQ06 (ORCPT ); Wed, 22 Jul 2020 12:26:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726649AbgGVQ06 (ORCPT ); Wed, 22 Jul 2020 12:26:58 -0400 Received: from mail-il1-x142.google.com (mail-il1-x142.google.com [IPv6:2607:f8b0:4864:20::142]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D032AC0619E1 for ; Wed, 22 Jul 2020 09:26:57 -0700 (PDT) Received: by mail-il1-x142.google.com with SMTP id p15so1787845ilh.13 for ; Wed, 22 Jul 2020 09:26:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=2kHXQvVGBuGkaVHirVH2ldXpqiigd2kMJlKCki7PqMg=; b=ra98AzIYvVtLIKFmQ0582LpmVzZLDFtXPiDLxSIB7SoDAYKfzHUmecVZxZuP/M6Pvb fDufO1C+Q4FiAbYniw6ePsXq6IniiF94IvlcqmWtmSWtqcN5EqOCbg+nsxHw7v2/BzpD yqdQ4eKGDs88B1pTQ+/lVZ3atNYajhFCrKFlxc6iGCv2w9U5QibkcB5fjdiaYFspwg/7 DUAeDu27aJnyG2kaxKFRHFuV9pRJvCocGy9/pSs9I4O2w31H+artkiu+wABWqj20BtFU 4mfkDrAHear+tV6pm6mm5Q1TEtNXZAq/Blh918qa8SfTMXEI9nUlQIkjpdOHfrsto+Ju hfqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=2kHXQvVGBuGkaVHirVH2ldXpqiigd2kMJlKCki7PqMg=; b=WoPv0u5dt+LywxVr5GaRGyCr4o4bnNYZEXAsaMO46o7Ez1rFZ5pCGss+m7qSUWjYZg sD5urVj4+s//P5CiQW3qIG6VaibsXi5A5j1U81YhsrPT97zFs2/FcjZ+Q0gHX1ZRE+jK 56cqlmHdGtEps/g5Ad3WtYZV+kaVSi999++0LlajKKPhSKNmCfuteDsQdxyFlR9AYFlZ e7fmK/sAuINVUkPiVUphALqhVNbUD/FhN51YUtXAkmgPHV0InpIVJYf3xaZul5j3KIwQ e1OLsQM8usXGj79dN0lPIhq5lXdyBVhsEFlFJaUuCfD8xA69Y0eXt8lqLB5/TDSHoD1w Ye6Q== X-Gm-Message-State: AOAM5303zyD4XYZCf0NjEPRKM+Si2r7NxQE7bvs+MkeE+cI7Y2JipZlx ZHpjgglowwhrXVa6/EMrojstN9b2DgLXuRebQk/lSg== X-Google-Smtp-Source: ABdhPJzNeJo6F0VTZ0S6U9fuGWdBKZjH6dGksbNLyWqgmXOtrkpA/UinCG7oju3HCUHK5DY6DzL72Fr4547fWGtbqgk= X-Received: by 2002:a05:6e02:1253:: with SMTP id j19mr673988ilq.145.1595435216934; Wed, 22 Jul 2020 09:26:56 -0700 (PDT) MIME-Version: 1.0 References: <20200722062552.212200-1-hch@lst.de> <20200722062552.212200-12-hch@lst.de> In-Reply-To: <20200722062552.212200-12-hch@lst.de> From: Shakeel Butt Date: Wed, 22 Jul 2020 09:26:45 -0700 Message-ID: Subject: Re: [PATCH 11/14] mm: use SWP_SYNCHRONOUS_IO more intelligently To: Christoph Hellwig Cc: Jens Axboe , Song Liu , Hans de Goede , Richard Weinberger , Minchan Kim , linux-mtd@lists.infradead.org, dm-devel@redhat.com, "open list:BLOCK LAYER" , LKML , drbd-dev@lists.linbit.com, linux-raid@vger.kernel.org, linux-fsdevel , Linux MM , Cgroups Content-Type: text/plain; charset="UTF-8" Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On Tue, Jul 21, 2020 at 11:27 PM Christoph Hellwig wrote: > > There is no point in trying to call bdev_read_page if SWP_SYNCHRONOUS_IO > is not set, as the device won't support it. > > Signed-off-by: Christoph Hellwig > --- > mm/page_io.c | 18 ++++++++++-------- > 1 file changed, 10 insertions(+), 8 deletions(-) > > diff --git a/mm/page_io.c b/mm/page_io.c > index ccda7679008851..442061348dfb26 100644 > --- a/mm/page_io.c > +++ b/mm/page_io.c > @@ -403,15 +403,17 @@ int swap_readpage(struct page *page, bool synchronous) > goto out; > } > > - ret = bdev_read_page(sis->bdev, swap_page_sector(page), page); > - if (!ret) { > - if (trylock_page(page)) { > - swap_slot_free_notify(page); > - unlock_page(page); > - } > + if (sis->flags & SWP_SYNCHRONOUS_IO) { > + ret = bdev_read_page(sis->bdev, swap_page_sector(page), page); > + if (ret) { !ret > + if (trylock_page(page)) { > + swap_slot_free_notify(page); > + unlock_page(page); > + } > > - count_vm_event(PSWPIN); > - goto out; > + count_vm_event(PSWPIN); > + goto out; > + } > } > > ret = 0; > -- > 2.27.0 >