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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A59B1D0BB4B for ; Thu, 24 Oct 2024 01:16:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EB28B6B0085; Wed, 23 Oct 2024 21:16:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E61946B0088; Wed, 23 Oct 2024 21:16:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D77816B0089; Wed, 23 Oct 2024 21:16:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id BA6676B0085 for ; Wed, 23 Oct 2024 21:16:51 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id AD634AC8D0 for ; Thu, 24 Oct 2024 01:16:15 +0000 (UTC) X-FDA: 82706730918.12.A762FE7 Received: from out30-133.freemail.mail.aliyun.com (out30-133.freemail.mail.aliyun.com [115.124.30.133]) by imf17.hostedemail.com (Postfix) with ESMTP id 7E57A40006 for ; Thu, 24 Oct 2024 01:16:34 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=M6Tl+lgz; spf=pass (imf17.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.133 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1729732456; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Qnk096CiX7Pk/CSCQimh/EKFgiLGtot63MiBL2wFm/o=; b=pi3oyXBQmMof7LJjaJPxp91uZ5pvum5myMV5QiuPmn3xEWxmRmCpv/aPsH8MzcvfIhNrDO twmLTi0MzOt86r8o+fdp4jo61Ht/OItO9c71EaeHdCRGHKZyk3h0AaLak7dp/uva9xkDJf y5ovJOSCaK7a/SWnhlJc3qknjHfsH4E= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729732456; a=rsa-sha256; cv=none; b=XlRxlyzH475q6UxPThHPxvq7WH/dODo5GnU0nF1sSS7lo+j6YmAvmUuMbnt4voXcQ0h5C9 9e1ONTesQU3srGJ0DAxNnQHLkX0pQyB6mjLmoJAm5E81ySJ9f0+p57C45aSRJf2J9rYQja Jknm2J62mlyQc0DdZh9tJ26NP14fyfI= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=M6Tl+lgz; spf=pass (imf17.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.133 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1729732603; h=Message-ID:Date:MIME-Version:Subject:To:From:Content-Type; bh=Qnk096CiX7Pk/CSCQimh/EKFgiLGtot63MiBL2wFm/o=; b=M6Tl+lgzFySgrsEtZAX4C0kgqG3RH1RgMQmNedDjcrBoOyZXkk6j+RqE0sLkCSFs48m8hLgs/tnDB9bXMUtrmPKnXQexMAt+ViqdRb/d1QWufpf83vG8fRyXwoo6h0ghWV6BAXP2wWCwcUHz2zKReU7slY9OJ2sYpW2+vTOr66Q= Received: from 30.74.144.130(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WHnBHUk_1729732601 cluster:ay36) by smtp.aliyun-inc.com; Thu, 24 Oct 2024 09:16:42 +0800 Message-ID: <51c227da-eea8-411a-983e-23bcd85ef5ae@linux.alibaba.com> Date: Thu, 24 Oct 2024 09:16:39 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] mm: Fix PSWPIN counter for large folios swap-in To: Barry Song <21cnbao@gmail.com>, akpm@linux-foundation.org, linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, Barry Song , Chris Li , Yosry Ahmed , David Hildenbrand , "Huang, Ying" , Kairui Song , Ryan Roberts , Kanchana P Sridhar , Usama Arif References: <20241023210201.2798-1-21cnbao@gmail.com> From: Baolin Wang In-Reply-To: <20241023210201.2798-1-21cnbao@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 7E57A40006 X-Stat-Signature: 915mcegd16w74nw9yohtgfaoj3zjh6hu X-HE-Tag: 1729732594-213631 X-HE-Meta: U2FsdGVkX1+iKCEDBb4nBtJHBSz0cdYQhYSnqmlqukTtgStN+Cm8C7XQ5GcAYJoz2wUgvRaW7vGGyQYpS3PYh6e0mwkGZlpC3CEWOKUFNlF4RJw89UyLq4gp9s6NHovRw0tTUWDLsQ34Q0Y9VZku4D+MGELgpJPzxj+VL6qEsBnTQSzDLrvEWUE/OA6ZI1/+BzYkwAzY/KvLotHJ+k5wd8ZA0KuMhdgutZFTpMq0faMNiNZVvO1O8HfGz6D7TML/Hd7sDn+M3QPW+4z0YdZyispD7qhQOhR6lz6RZbGV44UUbQBkkxaaAOQlFZE1b+h/m/59PyMJPapo6NlJQeDwJBD/He7SrNHaLLn5m0qiUj52LhBcytMNzQ6M2xyLOmog5ToW93hAfhuc3wEN+AhpZheXlMUKb8EbbpDzrVCIZwfHUZyqUIqvsfcARqC554mmRCtvTMOxrwkzCRA99OwGATyL2DG7IBTnzu60uIj2UyWdpLmJ/gqTk9FjgxQnJMys38jeEz7zPMYQfzH2hyG1T122h3412C4Q+ixawpgLz7SwhmGLE4WFpa6KaiLgVm/0YF3EjcA5zvFge2rSkXSHcckAXtm7FCCjq2E4+IpgfzdixPiNJBjJMfVZMWS0lrti9K0gTDTkyOHZqXnQxxdjoSpETIMPin9XAal5TTCAtJqNwY5PE/JRwMmAqlDU8dBszRH2AcHkFsmvMTYvTC7HKPudttL9LB5DhRK/3OHUySJ4nt2wuG+S2JtpMEuFuN2Z/QBxSechgVE0CZCE6BHL/wQ8zca8cjTQ4MuX4bGig1VS9WpAzMKTL6AMvSkWixNMUUWdNGcGa6LeTzvvJcL1rfTH8e9l3U/TUq2Pt+iSMhmMiJviO6Ilqgp7gQWpEmsODlEuTZDEiq9M3dNxBwf68KUELWiqc8w9uRx68RSLewCRpP/YR6SFbqSfftPuNp0aihvAPu0rEjuZa5+uKCO 942Mn+HM BMA+RErM4p2CwsIk+XKVbkTXzWlajIcmcTymQnTa7OkveHkJClnWh2Ia9X5cTuE/J9Gkq1Ojo37qQSZEisNtoFw6Z5BCFQ81yxNhn+8VhqQfeJTm6D2jXVgzTrENWVd4g3hur8Tfp48rq1g6KX7NEPG3YCi0jaIMhK62Tf2Xs5dUvC5T1QHXjLgdKWPwJz3C3TnAwmvxPrj3M5CUjvUqWHy3wrM0981JNeZSIO0FuhU9tdlL8MAH0p6hGhVJWrxkGTh9afnYuBjihtsIwVEMJoQLRzXSW6l9IrD/hrev0aNA9Krl6T3AVueJ2Or0M+s9bEcKGM4nQ606CiYI8neNSEigzmCKHk3mgYTg1KwgkmoiLnf+sNSOFVWuzaSlE5Zj1kTplF+okhgJc7mt3oraQ1cVmol90jsqj/Z6/42tsl3nohfvzS/6steq6m8uWn8AcXqIkCydcUihoTEKxV3+TVlodvDCyQVvXsWjMLMFRgb8bXbqKUrZhkFqzIA== 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: List-Subscribe: List-Unsubscribe: On 2024/10/24 05:02, Barry Song wrote: > From: Barry Song > > Similar to PSWPOUT, we should count the number of base pages > instead of large folios. > > Fixes: 242d12c98174 ("mm: support large folios swap-in for sync io devices") > Cc: Chris Li > Cc: Yosry Ahmed > Cc: Baolin Wang > Cc: David Hildenbrand > Cc: "Huang, Ying" > Cc: Kairui Song > Cc: Ryan Roberts > Cc: Kanchana P Sridhar > Cc: Usama Arif > Signed-off-by: Barry Song LGTM. Reviewed-by: Baolin Wang > --- > mm/page_io.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/mm/page_io.c b/mm/page_io.c > index a28d28b6b3ce..c69fab5060a1 100644 > --- a/mm/page_io.c > +++ b/mm/page_io.c > @@ -574,7 +574,7 @@ static void swap_read_folio_bdev_sync(struct folio *folio, > */ > get_task_struct(current); > count_memcg_folio_events(folio, PSWPIN, folio_nr_pages(folio)); > - count_vm_event(PSWPIN); > + count_vm_events(PSWPIN, folio_nr_pages(folio)); > submit_bio_wait(&bio); > __end_swap_bio_read(&bio); > put_task_struct(current); > @@ -590,7 +590,7 @@ static void swap_read_folio_bdev_async(struct folio *folio, > bio->bi_end_io = end_swap_bio_read; > bio_add_folio_nofail(bio, folio, folio_size(folio), 0); > count_memcg_folio_events(folio, PSWPIN, folio_nr_pages(folio)); > - count_vm_event(PSWPIN); > + count_vm_events(PSWPIN, folio_nr_pages(folio)); > submit_bio(bio); > } >