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 2E4CEC10F1A for ; Tue, 7 May 2024 11:11:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8FE3F6B009A; Tue, 7 May 2024 07:11:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8ADD56B009C; Tue, 7 May 2024 07:11:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 727FE6B009F; Tue, 7 May 2024 07:11:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 5369B6B009A for ; Tue, 7 May 2024 07:11:46 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id EF3CA140E4E for ; Tue, 7 May 2024 11:11:45 +0000 (UTC) X-FDA: 82091334570.27.D7CB5D3 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf15.hostedemail.com (Postfix) with ESMTP id A8DF2A0005 for ; Tue, 7 May 2024 11:11:43 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=FPJ9hZJi; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf15.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1715080303; 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=ma0A4QRl86cN5zI8gVEOGGJ7sRXSSgsvkjwuFJ/hkXo=; b=KJniEKoboYMfy3BLcYnsaO2wSWTSi6HHVo6MUEZ7k20cOMKSZpD+n4QHU5qefsfJRteXUq VBv9Vn2n2g0IjqYWCupDDfn0sHwIM8yvr+5yKSyqL8qPbocqRAQ+/QqZL8p51ABbTroFNm mcNaAmTlg33qvK/gwKVz6RCOJToP2QA= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=FPJ9hZJi; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf15.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715080303; a=rsa-sha256; cv=none; b=ThbowmCHuS8JhQGcV5CdwO/dVkDxJEVPm0TIsyKv5eTh0DcstuDgy28Q/xBCMZYoWuyZSR Q64i2Q9CC+hjtCmCxWrLeJJIpF9v62IWipZchdppFTSgPMnUkUWilvtHTyGBNat1Jj3ML+ KHqb4DvTbQ9Y+inLQLbmzmdKRwKCDkM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715080303; h=from:from: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:autocrypt:autocrypt; bh=ma0A4QRl86cN5zI8gVEOGGJ7sRXSSgsvkjwuFJ/hkXo=; b=FPJ9hZJimxpqq2opDWee9uPkMaFFpOUCovGokt8GoHpCVcl2WGBBOGbnjAl1cVerQj5UA4 V6d6WhnuAZDa6ASQfDXZV5St0+wNljAjEU0RPit0rRAsThcnk7BEhKrYXTQRHLvbYPMlOd nKxeoSzL5vttwHv4udiDLlbbtIAEqlg= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-112-bFqxaL_aPNGaolT_4sZY5w-1; Tue, 07 May 2024 07:11:41 -0400 X-MC-Unique: bFqxaL_aPNGaolT_4sZY5w-1 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-34dc66313b3so2069049f8f.2 for ; Tue, 07 May 2024 04:11:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715080300; x=1715685100; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:from:references:cc:to:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=ma0A4QRl86cN5zI8gVEOGGJ7sRXSSgsvkjwuFJ/hkXo=; b=MriazG+mNRW/UoaO0AD34XaYp5Xp/RDngf9MhFJEp93PIG+5vrQhas82Dfv+eBJcdt HS2SWtEL8VUoYoKl1rkCV9GanMmctM1vJ+5HthMwNFppGUAi+FeqFMQvWWTuiTN3MLDG smasGIFSTRzFrrSIkxHfZhugeb1QPnr1wy6LaItsxH7vt5AK1nh5G7cEpXTnZ3iRJp8h RCAugfR1HTTurEYeshKy3hfH6DMeGleq7GC6nSS1S9iLhRmnc4TdVpbclr57z9/qdM8h m/a8tUfD2yEVTO8FPusjgTjcSRrsE7UnWVP5jjOmpCvky1mWCXauInYqRfx9uE9LFrP3 ZGGQ== X-Forwarded-Encrypted: i=1; AJvYcCXFZqt/GzfMonZxUrIW0uHsjFutdOg5GQl+oIG59ELaUP3ps+cEaIS/JY/gp90X6eGeuPoRku7IklwcERUfVY04+tM= X-Gm-Message-State: AOJu0YyproFFiUXatRhutSoj9QDO4gAoIs3BlpEhsenHyh5++jyWJoY0 7Xk9MdzqSD6Dod2rDiHr9LBW+PHqlmdtc9yEWdeutEznsXpJ07Pen+xewR7qC/CA2hHpRPiPUJD UNcvfY7O+7d7ip8a00OdTNYruZxO4mi9eMHCcK8172f14zmBc X-Received: by 2002:a5d:678b:0:b0:34b:44d7:f3eb with SMTP id v11-20020a5d678b000000b0034b44d7f3ebmr12357277wru.3.1715080300210; Tue, 07 May 2024 04:11:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH6FKYSsj/W4OlQLkmUqONrveJsDpA25wL1LvAbxjFl57Qr95M9yN00ccrpuzPdeX9P3+kuCQ== X-Received: by 2002:a5d:678b:0:b0:34b:44d7:f3eb with SMTP id v11-20020a5d678b000000b0034b44d7f3ebmr12357257wru.3.1715080299685; Tue, 07 May 2024 04:11:39 -0700 (PDT) Received: from ?IPV6:2a09:80c0:192:0:5dac:bf3d:c41:c3e7? ([2a09:80c0:192:0:5dac:bf3d:c41:c3e7]) by smtp.gmail.com with ESMTPSA id cx14-20020a056000092e00b0034a2d0b9a4fsm12816762wrb.17.2024.05.07.04.11.39 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 07 May 2024 04:11:39 -0700 (PDT) Message-ID: <0bf097d2-6d2a-498b-a266-303f168b6221@redhat.com> Date: Tue, 7 May 2024 13:11:38 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH rfc 3/4] mm: filemap: move __lruvec_stat_mod_folio() out of filemap_set_pte_range() To: Kefeng Wang , Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org References: <20240429072417.2146732-1-wangkefeng.wang@huawei.com> <20240429072417.2146732-4-wangkefeng.wang@huawei.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20240429072417.2146732-4-wangkefeng.wang@huawei.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam01 X-Stat-Signature: ja3kh3ib5qdmp4akwn8xcwkfup1t4egr X-Rspam-User: X-Rspamd-Queue-Id: A8DF2A0005 X-HE-Tag: 1715080303-502147 X-HE-Meta: U2FsdGVkX19dV18VUexENLif88MeL5scn7NCuOqlmroyOgCynsYHWvhZD+WGCuOeAaYNUsAyDS+oQYfmbkJWg274wM78z8BQk5xPc2q/YfqxbdZu31RUwiqfs+UZo0BswMID1Hf2nHmOlMHNm1QbufVdLK/LOAjvOOjikHEe5ts+PjejGisq6BdLQer7Ma82jLKx/WcEwTSgALFNiP/JbtQBRj91oxUv7kFtzbDBvOSXkrz98LmAhm6IxyZHnNnkgjcasKb+sQX1uekgU/rIXo0JGHA8d1PX3PC1fd7MCCNe6xHCnxPL+obQeDYRgPqmtBevcgCAIW1WBN961BfsCmqApOOMmRcfvcq+iWGBU21ZP+AYT74mImv2D59nLDBCdl83kt9ykb18PDG0BXdTCJULcVzI6C2UI50k3xgJSzpbTzq6qtI/CavqDaNMm1k+kvoNpzw/mC+raH6I6UV0jrAf+/vXoYYPMWFG/3WiJH2Gld5Uv+GDyRY4i09UUhSAwrVb/MscGNaWzdAtp6F4r+WuEm9u2Qi0QmBejIPqp6BVuj8VJ81gBNpjIvc1l+QHQqfVZ74CisM6bPA1PoxF4CZHk60RT/ylfxGskUDKm1lWNe93bVt53o9lAiuJV2wujzBWFUqfb0UpnzQS72C+mGHGF+NU6B41s/vMu5OMD/qJJDt+2b+3XpqHQ1cmZhQS2Ml6dtoI08WJaFT7fexCwvg5H5fbGTQcBnVgHDG7ftneOjOds2kL9Puc1n3Pnd7qsskb5xRyj4eEZguQGLnEdNq0FsFfY24t10TuBuA6nCeFPDKanY9q/tlGZ2Ps/uTv5S4l0rjbIIPvPWywFX+ksbnXo4clEPz01t9asF3WVMiAI/vJKHjEb2k+lhvyc+8hlY3aWMzRlM25ZEcM3vtJZN76Hl3meKfZ8AMCS69ggTSyq9OMZ1l2iEyJixIMnTGdC1vsHnwEHl8ZbCBF7ub Zh5eyhWk Vz6Im2sIXzBUtc3ZUSVq+qvCEaQlHP6jfb/36b7Y7UWI6c/6YSADgmTkH+SYhsLdXxGSXfpD7XUu0rOA8bFHkMFM21ooxIf13/bbgx6nUu9GCEw0pvtt3WsJuv5ESoOdTpTih/qXZdYJIBcQgcABa3jeJuY4s3bopxg/Agqs4iT+DSomGKtqXPu3b0g9Vuq/wGGuq63GjAeOqBf8FgH652TwGBTewNpWitbODDmCa1fCPcX+IlXCMdT35KCrhAYp7f7GLrdPIbAG55aV29pS8gK7xy488dFgZI0Mx/+2lmOPjhK/JVfd9ZZ5uhEF9U2P+M9NXwUsdvb0mQN90Lgg0Sq1wdKTsSd1j4oS2aPaK9soTO5p0QUSPlC8sM8QRmolGnyYiqwTr3hAJIfDYXizhoMUaa4AkOjdjEdXlTqHQke0+IAAOIfX/i1bD5mYl327S0A1th6kNgVKUGe1KO8/Y/MWUrZIYrTSNJTSdfQACXa6B7Ybd1Wqjz0zL+g== 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 29.04.24 09:24, Kefeng Wang wrote: > Adding __folio_add_file_rmap_ptes() which don't update lruvec stat, it > is used in filemap_set_pte_range(), with it, lruvec stat updating is > moved into the caller, no functional changes. > > Signed-off-by: Kefeng Wang > --- > include/linux/rmap.h | 2 ++ > mm/filemap.c | 27 ++++++++++++++++++--------- > mm/rmap.c | 16 ++++++++++++++++ > 3 files changed, 36 insertions(+), 9 deletions(-) > > diff --git a/include/linux/rmap.h b/include/linux/rmap.h > index 7229b9baf20d..43014ddd06f9 100644 > --- a/include/linux/rmap.h > +++ b/include/linux/rmap.h > @@ -242,6 +242,8 @@ void folio_add_anon_rmap_pmd(struct folio *, struct page *, > struct vm_area_struct *, unsigned long address, rmap_t flags); > void folio_add_new_anon_rmap(struct folio *, struct vm_area_struct *, > unsigned long address); > +int __folio_add_file_rmap_ptes(struct folio *, struct page *, int nr_pages, > + struct vm_area_struct *); > void folio_add_file_rmap_ptes(struct folio *, struct page *, int nr_pages, > struct vm_area_struct *); > #define folio_add_file_rmap_pte(folio, page, vma) \ > diff --git a/mm/filemap.c b/mm/filemap.c > index 7019692daddd..3966b6616d02 100644 > --- a/mm/filemap.c > +++ b/mm/filemap.c > @@ -3501,14 +3501,15 @@ static struct folio *next_uptodate_folio(struct xa_state *xas, > > static void filemap_set_pte_range(struct vm_fault *vmf, struct folio *folio, > struct page *page, unsigned int nr, unsigned long addr, > - unsigned long *rss) > + unsigned long *rss, int *nr_mapped) > { > struct vm_area_struct *vma = vmf->vma; > pte_t entry; > > entry = prepare_range_pte_entry(vmf, false, folio, page, nr, addr); > > - folio_add_file_rmap_ptes(folio, page, nr, vma); > + *nr_mapped += __folio_add_file_rmap_ptes(folio, page, nr, vma); > + > set_ptes(vma->vm_mm, addr, vmf->pte, entry, nr); > > /* no need to invalidate: a not-present page won't be cached */ > @@ -3525,7 +3526,8 @@ static void filemap_set_pte_range(struct vm_fault *vmf, struct folio *folio, > static vm_fault_t filemap_map_folio_range(struct vm_fault *vmf, > struct folio *folio, unsigned long start, > unsigned long addr, unsigned int nr_pages, > - unsigned long *rss, unsigned int *mmap_miss) > + unsigned long *rss, int *nr_mapped, > + unsigned int *mmap_miss) > { > vm_fault_t ret = 0; > struct page *page = folio_page(folio, start); > @@ -3558,7 +3560,8 @@ static vm_fault_t filemap_map_folio_range(struct vm_fault *vmf, > continue; > skip: > if (count) { > - filemap_set_pte_range(vmf, folio, page, count, addr, rss); > + filemap_set_pte_range(vmf, folio, page, count, addr, > + rss, nr_mapped); > if (in_range(vmf->address, addr, count * PAGE_SIZE)) > ret = VM_FAULT_NOPAGE; > } > @@ -3571,7 +3574,8 @@ static vm_fault_t filemap_map_folio_range(struct vm_fault *vmf, > } while (--nr_pages > 0); > > if (count) { > - filemap_set_pte_range(vmf, folio, page, count, addr, rss); > + filemap_set_pte_range(vmf, folio, page, count, addr, rss, > + nr_mapped); > if (in_range(vmf->address, addr, count * PAGE_SIZE)) > ret = VM_FAULT_NOPAGE; > } > @@ -3583,7 +3587,7 @@ static vm_fault_t filemap_map_folio_range(struct vm_fault *vmf, > > static vm_fault_t filemap_map_order0_folio(struct vm_fault *vmf, > struct folio *folio, unsigned long addr, > - unsigned long *rss, unsigned int *mmap_miss) > + unsigned long *rss, int *nr_mapped, unsigned int *mmap_miss) > { > vm_fault_t ret = 0; > struct page *page = &folio->page; > @@ -3606,7 +3610,7 @@ static vm_fault_t filemap_map_order0_folio(struct vm_fault *vmf, > if (vmf->address == addr) > ret = VM_FAULT_NOPAGE; > > - filemap_set_pte_range(vmf, folio, page, 1, addr, rss); > + filemap_set_pte_range(vmf, folio, page, 1, addr, rss, nr_mapped); > > return ret; > } > @@ -3646,6 +3650,7 @@ vm_fault_t filemap_map_pages(struct vm_fault *vmf, > folio_type = mm_counter_file(folio); > do { > unsigned long end; > + int nr_mapped = 0; > > addr += (xas.xa_index - last_pgoff) << PAGE_SHIFT; > vmf->pte += xas.xa_index - last_pgoff; > @@ -3655,11 +3660,15 @@ vm_fault_t filemap_map_pages(struct vm_fault *vmf, > > if (!folio_test_large(folio)) > ret |= filemap_map_order0_folio(vmf, > - folio, addr, &rss, &mmap_miss); > + folio, addr, &rss, &nr_mapped, > + &mmap_miss); > else > ret |= filemap_map_folio_range(vmf, folio, > xas.xa_index - folio->index, addr, > - nr_pages, &rss, &mmap_miss); > + nr_pages, &rss, &nr_mapped, > + &mmap_miss); > + > + __lruvec_stat_mod_folio(folio, NR_FILE_MAPPED, nr_mapped); > > folio_unlock(folio); > folio_put(folio); > diff --git a/mm/rmap.c b/mm/rmap.c > index 2608c40dffad..55face4024f2 100644 > --- a/mm/rmap.c > +++ b/mm/rmap.c > @@ -1452,6 +1452,22 @@ static __always_inline void __folio_add_file_rmap(struct folio *folio, > mlock_vma_folio(folio, vma); > } > > +int __folio_add_file_rmap_ptes(struct folio *folio, struct page *page, > + int nr_pages, struct vm_area_struct *vma) > +{ > + int nr, nr_pmdmapped = 0; > + > + VM_WARN_ON_FOLIO(folio_test_anon(folio), folio); > + > + nr = __folio_add_rmap(folio, page, nr_pages, RMAP_LEVEL_PTE, > + &nr_pmdmapped); > + > + /* See comments in folio_add_anon_rmap_*() */ > + if (!folio_test_large(folio)) > + mlock_vma_folio(folio, vma); > + > + return nr; > +} I'm not really a fan :/ It does make the code more complicated, and it will be harder to extend if we decide to ever account differently (e.g., NR_SHMEM_MAPPED, additional tracking for mTHP etc). With large folios we'll be naturally batching already here, and I do wonder, if this is really worth for performance, or if we could find another way of batching (let the caller activate batching and drain afterwards) without exposing these details to the caller. Note that there is another cleanup happening [1]. [1] https://lore.kernel.org/all/20240506192924.271999-1-yosryahmed@google.com/T/#u -- Cheers, David / dhildenb