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=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, FSL_HELO_FAKE,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,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 D674AECE58C for ; Wed, 9 Oct 2019 22:43:59 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 92F2D218AC for ; Wed, 9 Oct 2019 22:43:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NPudgn2r" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 92F2D218AC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 2F8638E0003; Wed, 9 Oct 2019 18:43:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 282216B0005; Wed, 9 Oct 2019 18:43:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 121658E0003; Wed, 9 Oct 2019 18:43:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0230.hostedemail.com [216.40.44.230]) by kanga.kvack.org (Postfix) with ESMTP id E7A4B6B0003 for ; Wed, 9 Oct 2019 18:43:58 -0400 (EDT) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with SMTP id 9245A181AC9AE for ; Wed, 9 Oct 2019 22:43:58 +0000 (UTC) X-FDA: 76025725356.21.kiss39_589f3d56e15e X-HE-Tag: kiss39_589f3d56e15e X-Filterd-Recvd-Size: 6395 Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by imf18.hostedemail.com (Postfix) with ESMTP for ; Wed, 9 Oct 2019 22:43:57 +0000 (UTC) Received: by mail-pl1-f195.google.com with SMTP id f21so1755187plj.10 for ; Wed, 09 Oct 2019 15:43:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=00g0gfol9RJzRPWbkeeT8ZIvY5uGonsXfuas28jebqc=; b=NPudgn2rNbJ4GsO9Xe8lglZpwIH9cElsJGpgxmZW1fVZi90cox8QMjusz+eqtLzQjs waWp1JsWDpoRG/5l3Gz+I+hS8PIrF44pBpyY5fazpW0pZI+h7aXtMYn/p8rZsXEo1RgB hM0fSvfjN699RNzbGGRAROF6hC4MbKcWo3gfwzdw6fjbB3jMKrQyGB8QA2X9cNzMncM9 Wayz5fQmpxlCBnDAjuEyMbAzhwq/oq0f95UZETWHCp8eSrrOUhDAZmn+WdKi93IQiNqz A0qq45SIWtBhnt9AnvMxxibNd6H/2eBYkJDXlCH/LxUhxNh7A6yuVSDlpVhVPlJ9I+ki qMSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to:user-agent; bh=00g0gfol9RJzRPWbkeeT8ZIvY5uGonsXfuas28jebqc=; b=djm6g4ETCfCK0zos4vl1wotn4IhumqXBABDNXzJChIwA2gGUghMi8RetmIAAzTCqtq 8mX4N6o/IfaPuB0bVtR5+lFtA7pM4g/WfpcmJqpISKcgDOU7jSw3B5939lEI+XHnpXxF f3jkhK1OwlNnMpZyDGoqiQqbNkbrjHH5QWCMgydNs4OSHMEUO7YYNlf0QHreNjrOKcnl RI8W2EuVFiUouhnFZNTZkBi1H2ICrYfbzZMRRJozJtIdeOKpmWEeWBGpHN1sw89d9VpN dHYflajGKPE0fMFzrdUEkhI8zvnrP8t6ve56C/BlU59PuN6se68DR2uB3lmMkmZo3OGH WQWA== X-Gm-Message-State: APjAAAUzgfHz1IuissGo1JHCi+t+9gVA8rDgCnVcpPs5wygbPhN/F8iK N22ZINxET7Wp7eiqK7N2rx4= X-Google-Smtp-Source: APXvYqzl1UID70I008rOENSyOuw8kamFQYecb+i3Y7NX2qTGDmC9p+1nyHnKVpZGgaCqdF7S4nurLg== X-Received: by 2002:a17:902:8f89:: with SMTP id z9mr5314721plo.228.1570661036771; Wed, 09 Oct 2019 15:43:56 -0700 (PDT) Received: from google.com ([2620:15c:211:1:3e01:2939:5992:52da]) by smtp.gmail.com with ESMTPSA id q42sm3356237pja.16.2019.10.09.15.43.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Oct 2019 15:43:55 -0700 (PDT) Date: Wed, 9 Oct 2019 15:43:53 -0700 From: Minchan Kim To: Shakeel Butt Cc: Andrew Morton , LKML , linux-mm , Johannes Weiner Subject: Re: [PATCH] fs: annotate refault stalls from bdev_read_page Message-ID: <20191009224353.GA63899@google.com> References: <20191009211857.35587-1-minchan@kernel.org> 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-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 Wed, Oct 09, 2019 at 03:25:10PM -0700, Shakeel Butt wrote: > On Wed, Oct 9, 2019 at 2:19 PM Minchan Kim wrote: > > > > From: Minchan Kim > > > > If block device supports rw_page operation, it doesn't submit bio > > so annotation in submit_bio for refault stall doesn't work. > > It happens with zram in android, especially swap read path which > > could consume CPU cycle for decompress. > > What about zswap? Do we need the same in zswap_frontswap_load()? Yub, it needs it. Maybe, a annotation in swap_readpage will cover both all at once in real pratice unless we need to take care of nvdimms which supports rw_page operation. Thanks. > > > > > Annotate bdev_read_page() to account the synchronous IO overhead > > to prevent underreport memory pressure. > > > > Cc: Johannes Weiner > > Signed-off-by: Minchan Kim > > --- > > fs/block_dev.c | 13 +++++++++++++ > > mm/memory.c | 1 + > > 2 files changed, 14 insertions(+) > > > > diff --git a/fs/block_dev.c b/fs/block_dev.c > > index 9c073dbdc1b0..82ca28eb9a57 100644 > > --- a/fs/block_dev.c > > +++ b/fs/block_dev.c > > @@ -26,6 +26,7 @@ > > #include > > #include > > #include > > +#include > > #include > > #include > > #include > > @@ -701,6 +702,8 @@ int bdev_read_page(struct block_device *bdev, sector_t sector, > > { > > const struct block_device_operations *ops = bdev->bd_disk->fops; > > int result = -EOPNOTSUPP; > > + unsigned long pflags; > > + bool workingset_read; > > > > if (!ops->rw_page || bdev_get_integrity(bdev)) > > return result; > > @@ -708,9 +711,19 @@ int bdev_read_page(struct block_device *bdev, sector_t sector, > > result = blk_queue_enter(bdev->bd_queue, 0); > > if (result) > > return result; > > + > > + workingset_read = PageWorkingset(page); > > + if (workingset_read) > > + psi_memstall_enter(&pflags); > > + > > result = ops->rw_page(bdev, sector + get_start_sect(bdev), page, > > REQ_OP_READ); > > + > > + if (workingset_read) > > + psi_memstall_leave(&pflags); > > + > > blk_queue_exit(bdev->bd_queue); > > + > > return result; > > } > > EXPORT_SYMBOL_GPL(bdev_read_page); > > diff --git a/mm/memory.c b/mm/memory.c > > index 06935826d71e..6357d5a0a2a5 100644 > > --- a/mm/memory.c > > +++ b/mm/memory.c > > @@ -2801,6 +2801,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) > > if (page) { > > __SetPageLocked(page); > > __SetPageSwapBacked(page); > > + SetPageWorkingset(page); > > set_page_private(page, entry.val); > > lru_cache_add_anon(page); > > swap_readpage(page, true); > > -- > > 2.23.0.581.g78d2f28ef7-goog > >