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 24855C636CC for ; Tue, 7 Feb 2023 20:12:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5C86B6B0120; Tue, 7 Feb 2023 15:12:30 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 579286B0122; Tue, 7 Feb 2023 15:12:30 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4410C6B0124; Tue, 7 Feb 2023 15:12:30 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 31F116B0120 for ; Tue, 7 Feb 2023 15:12:30 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id DF83E40BE2 for ; Tue, 7 Feb 2023 20:12:29 +0000 (UTC) X-FDA: 80441593218.16.2DCE95E Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf18.hostedemail.com (Postfix) with ESMTP id 51F5C1C0019 for ; Tue, 7 Feb 2023 20:12:27 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Gr7b9GbX; spf=none (imf18.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1675800747; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=9h4ihtcgFcuT6F8HLGxBLPscqZGMSJCVAH3r21uKKeI=; b=c65suAiz3F4FXdbUryLvE77aEsM7tvaHmcAyAWHEGWyznpxNnUPbNS+xWq1r00yGCSNqpU nGVs27fI862/ho3Tpj9GrShliQ/IbafyY1if+vVxka05BhNvekB6Fg1s0a5cG2TXN6upOe XvjkLoAMe9YWVjx84sQ73eUKP0OgIfQ= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Gr7b9GbX; spf=none (imf18.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675800747; a=rsa-sha256; cv=none; b=2fsmGFCT5GD4ySgmT4/e374LbjgLP+f7X2pL/iHET/85cLUT93V4DlpO+e8yHEDBK+No+r 1LjpY17ZnutcfGphZOI9rJYRFm7HY/yrom81/3pWdSUkksgUPKmW1SdspBPfdVGWb3g6YT CAcMNRWwOM7agC7FbY39TCB0RAs+bdM= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=9h4ihtcgFcuT6F8HLGxBLPscqZGMSJCVAH3r21uKKeI=; b=Gr7b9GbXb/LRP25MZ3pMW/XjDR nQTZzn5/ka6S3ydQyEjhW5WS4J6rs/D5/7iTtSuHywRA5GeoWErLkLi1cSU4yciyayHzPfBCxFhbE qnMTLvAZGNHwXw/rWMGRm1SMNmPGUKc9p1YEglJ6pneWzVlEJxMC/5nSwuDdvgY9OBEAafGIRXCRc kZJ0Jof+pl08vbRssxUmYV+K2xRL+uarpIJO11OedGddHVXo+CU5Gqp/DX/HjU4ksi0GPoHTahDMX 2DuFGVi03CsMkdmNAS3+MivSNSE7PiTkGyz46QjFSR3WRbQVMv4twpwCHLUklRJ/fmBI/eeaU/C9v r7Cm2RhQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pPTyG-000Vst-AE; Tue, 07 Feb 2023 19:49:40 +0000 From: "Matthew Wilcox (Oracle)" To: Yin Fengwei , linux-mm@kvack.org Cc: david@redhat.com, dave.hansen@intel.com, tim.c.chen@intel.com, ying.huang@intel.com, Matthew Wilcox Subject: [PATCH v5 3/5] rmap: add folio_add_file_rmap_range() Date: Tue, 7 Feb 2023 19:49:33 +0000 Message-Id: <20230207194937.122543-4-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230207194937.122543-1-willy@infradead.org> References: <20230207194937.122543-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 51F5C1C0019 X-Stat-Signature: i44c818dcfwtgdrg48a5idj93ueqpnkh X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1675800747-552078 X-HE-Meta: U2FsdGVkX1+aOC+BotPt4AzWGndjfsDWttzmfGDD5hA1NQf4cYgfBNmaC/FTtswmMiU8h02WR41UUHHWMon1tdyf94sXSvJ83RniIH8WO5cH5AZPHuiVa1SpcuqQYEjISodeOkAm5hz1YQrMsHEg88iEI1yGY8BndIYaeLs8ihFM2anNCudDZQGL/VFmfUgxpCwuXuKVhewDJ8MrQ+T6YfKQ5ZeggLzvReewkMB1iDLCSFXKr/DfZIYhI06lnSDfvf+N769gipp2Ohp8ZZleD4KfV1UuwC7Lk6LSFF9U/IYLLIqR9CzheQTKK+M/aBlfbIv7qiZ5e3l3Img6qEW5M9/HOWLNMsJUXd24HVJteAACinGwIRp0Njb0GR799hPYvVmUYpmJtXPT6C+OVe9Bn8rUO1q/NThwmo7+jMrXgjSY5zgNyVUtax6qxaOSa+XCYBv96ZaKicjmia2uprxTz13znKR3zhMPAQfMy3CCQnSNedDLio1r2/TFxhT6yAFRvh71z10sM6uwbrejDtCft/FZTLXNG+MNTUmrCa4mWsjNJj/sPJ5+iAUWaULPcWK7PI02fSrfgziLi7vHQN45DohVsn5LsT0BhNHvJlTUX28PUnrtDecpPpwuMF74Qpwzl0h0ukfKnBsIHsiSq8MEOF8zHTIi+0kcf1EDWzPN7EnGYEBE4ynbjsBLPepIn8ofOZ8yoL+Z31f4XTE+TAwjHAqIyRV0OvqQKi0LROmiUWy8ZqM4xTBJNh5pyL8oo58FlWdbDPvwLY2JpR6lXIpo91Y+d65uRrzhkb7BC9bysswyH7OIr47jErqCx2iswO5qhcpKJCxX3+X3ApQl9+vHATJWf9XXnzPvigxWtjs+HOo+GTl7qbtwcj1sbzeJZfLLmh40E7nulO6/STAZTYqhRwD8aoZ1rCcLlNoDeBVh1QBLz8Y98RT36+ikaAC4TULFmsz9hh2ZBirX7VOZ/Ih Mj41brxC Wep1O86TUqIRCHwWr4XcZg4ACyhrccHRm5sFTaAyifIJLivJ2XKK0ueuUTrgWYELqWRd64nMHsxA/Dkd0U6JWlB7bRlYXH9xH8/n+o1zYbnRW1uELhWASs2c0D6pMPRXm09pOBizG8PgBG5q3burbVhTOZ2odbkg4WxsEIISRrWCjOexSlkD0Dm2yAQmPwTSSmRsBLCUV5yVLjTZpLQZB80o8AnfWkIEwUtXZtGbY0RYVzIxzAydh/XLx/DPalHG6oDv0u4jV4Kw6mq8= 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: From: Yin Fengwei folio_add_file_rmap_range() allows to add pte mapping to a specific range of file folio. Comparing to page_add_file_rmap(), it batched updates __lruvec_stat for large folio. Signed-off-by: Yin Fengwei Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/rmap.h | 2 ++ mm/rmap.c | 60 +++++++++++++++++++++++++++++++++----------- 2 files changed, 48 insertions(+), 14 deletions(-) diff --git a/include/linux/rmap.h b/include/linux/rmap.h index a4570da03e58..125ede2fb049 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h @@ -198,6 +198,8 @@ void folio_add_new_anon_rmap(struct folio *, struct vm_area_struct *, unsigned long address); void page_add_file_rmap(struct page *, struct vm_area_struct *, bool compound); +void folio_add_file_rmap_range(struct folio *, struct page *, unsigned int nr, + struct vm_area_struct *, bool compound); void page_remove_rmap(struct page *, struct vm_area_struct *, bool compound); diff --git a/mm/rmap.c b/mm/rmap.c index d52d90af0a7e..b1929adc4924 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1303,31 +1303,39 @@ void folio_add_new_anon_rmap(struct folio *folio, struct vm_area_struct *vma, } /** - * page_add_file_rmap - add pte mapping to a file page - * @page: the page to add the mapping to + * folio_add_file_rmap_range - add pte mapping to page range of a folio + * @folio: The folio to add the mapping to + * @page: The first page to add + * @nr_pages: The number of pages which will be mapped * @vma: the vm area in which the mapping is added * @compound: charge the page as compound or small page * + * The page range of folio is defined by [first_page, first_page + nr_pages) + * * The caller needs to hold the pte lock. */ -void page_add_file_rmap(struct page *page, struct vm_area_struct *vma, - bool compound) +void folio_add_file_rmap_range(struct folio *folio, struct page *page, + unsigned int nr_pages, struct vm_area_struct *vma, + bool compound) { - struct folio *folio = page_folio(page); atomic_t *mapped = &folio->_nr_pages_mapped; - int nr = 0, nr_pmdmapped = 0; - bool first; + unsigned int nr_pmdmapped = 0, first; + int nr = 0; - VM_BUG_ON_PAGE(compound && !PageTransHuge(page), page); + VM_WARN_ON_FOLIO(compound && !folio_test_pmd_mappable(folio), folio); /* Is page being mapped by PTE? Is this its first map to be added? */ if (likely(!compound)) { - first = atomic_inc_and_test(&page->_mapcount); - nr = first; - if (first && folio_test_large(folio)) { - nr = atomic_inc_return_relaxed(mapped); - nr = (nr < COMPOUND_MAPPED); - } + do { + first = atomic_inc_and_test(&page->_mapcount); + if (first && folio_test_large(folio)) { + first = atomic_inc_return_relaxed(mapped); + first = (nr < COMPOUND_MAPPED); + } + + if (first) + nr++; + } while (page++, --nr_pages > 0); } else if (folio_test_pmd_mappable(folio)) { /* That test is redundant: it's for safety or to optimize out */ @@ -1356,6 +1364,30 @@ void page_add_file_rmap(struct page *page, struct vm_area_struct *vma, mlock_vma_folio(folio, vma, compound); } +/** + * page_add_file_rmap - add pte mapping to a file page + * @page: the page to add the mapping to + * @vma: the vm area in which the mapping is added + * @compound: charge the page as compound or small page + * + * The caller needs to hold the pte lock. + */ +void page_add_file_rmap(struct page *page, struct vm_area_struct *vma, + bool compound) +{ + struct folio *folio = page_folio(page); + unsigned int nr_pages; + + VM_WARN_ON_ONCE_PAGE(compound && !PageTransHuge(page), page); + + if (likely(!compound)) + nr_pages = 1; + else + nr_pages = folio_nr_pages(folio); + + folio_add_file_rmap_range(folio, page, nr_pages, vma, compound); +} + /** * page_remove_rmap - take down pte mapping from a page * @page: page to remove mapping from -- 2.35.1