From patchwork Wed Mar 15 05:14:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13175358 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 B6890C6FD1D for ; Wed, 15 Mar 2023 05:32:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 544478E0008; Wed, 15 Mar 2023 01:32:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4F4938E0001; Wed, 15 Mar 2023 01:32:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 394F68E0008; Wed, 15 Mar 2023 01:32:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 2B4E28E0001 for ; Wed, 15 Mar 2023 01:32:41 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 0462D1C695E for ; Wed, 15 Mar 2023 05:32:40 +0000 (UTC) X-FDA: 80570012922.13.E461684 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf05.hostedemail.com (Postfix) with ESMTP id E916E100010 for ; Wed, 15 Mar 2023 05:32:38 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=g5mC1e+E; spf=none (imf05.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=1678858359; 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=wGk85CR/Vctng7oBFjkMJq+NnlgBFRutHAfl1XoD7Y0=; b=3Vg3MNR1mya9AC+SEhk1JyKCksYIP+cg/hziflI/cKm9VY5EfM7I13WwVSgnTi9GO739ha Yxh4vzzYOWkwCETkdgRmjx1yUyeylt4yG9nT9Qq+8p99Je0VgVgVnYEYxn3O6YfexewIQ/ tIzB9wWnbD2GcqQ5TI2jMZdBn3PNSqs= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=g5mC1e+E; spf=none (imf05.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=1678858359; a=rsa-sha256; cv=none; b=Rf5gcNMSzo0dAdCTPHF4Hp4XQqXeWZNByuyNOH3VdmM8mqpsvsjwTb2qIwrv3B3adxLJN7 H+aBafK8B48sdB8dT9yAtquZPY3tXCWamr39r2XEEkQ7pWrM5nVuhy9hKw/FcEu5egyEqr sKIGCkmgsV32/Nd1oK9H7Hw6yRhL22M= 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=wGk85CR/Vctng7oBFjkMJq+NnlgBFRutHAfl1XoD7Y0=; b=g5mC1e+EyDeps/N6wOgNK48uE5 NY6T5TtawAzHoLWsQhDILMRhrQX9ZM+D075XgvvrVQWkZJLn7Q8AhVPPqiyi4J11YgM7o+meENJAL Dw16eYKgzteuuxGMuXlRMTH+J9Q6cDtVus0ee7yF2jdGr63Wa0pkqZIiEIL13eC3ASjbCgBqw4l3P PH4awXOcSI2eluFl5bJc028cmRgeBqG1mkXRZyGtFp5+XsRMny84X5Q21WcTuzpnFcvjDwcI7V3M2 vdQcdA8eIAXECldrZFJcR39/rd9cfuGhbwfRxGKw1tyhasbwt3TDiuF8/mntoH2cVEgfPhNQRwgF0 56XMdsMQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pcJTO-00DYE0-MR; Wed, 15 Mar 2023 05:14:50 +0000 From: "Matthew Wilcox (Oracle)" To: linux-arch@vger.kernel.org Cc: Yin Fengwei , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Matthew Wilcox Subject: [PATCH v4 34/36] rmap: add folio_add_file_rmap_range() Date: Wed, 15 Mar 2023 05:14:42 +0000 Message-Id: <20230315051444.3229621-35-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230315051444.3229621-1-willy@infradead.org> References: <20230315051444.3229621-1-willy@infradead.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: 9e71jeaqfaer1iyr8fwkokqk85suot7x X-Rspamd-Queue-Id: E916E100010 X-HE-Tag: 1678858358-699048 X-HE-Meta: U2FsdGVkX1/tqlAjIx/fTmgmg4o+6ZnZdWkRL04zdmdy1gopWhM+SODBMm9hybSNGEPJQI7zMs9aIpljyzCirdgoyi07fD2EHVclIoDZBlyNg2xRyREcKUr5xdMS7UhnvvuQ1EHfVuiEdqShR38/jPW8oXV1o4RRJhC5Ds946+gzNub3A0WppwxydmFg7YrFfK1MXet53/yZSU5OYfOf/yjcbJs3r7JlgVl2XKcY7cbCmBzX2UaxzKb1M0PEqWK3tKmX8TPuYUB3hroLdA3Dnd9pkfJv3k3WlLe7sIWyN3i7J+/1kY+0OOVIUlb3h2xGBCNNWnDzde1Xql5sceO2F6DXjS7FkeCdMgbV9ZRo2ohSoisiHtpetbo51myVCqWlm8bYU435BxyQNJD+jWVZmjIfuDQSUUbQZ6QndbTa+eHqro4UBz1o0pwZu6+wcJAQN9yZX68Vc3dPdjd2SV1FAiFHXzukH7mef738G3LUV9e+d3DNao5wBhxmkcLjepD/WmR0Gzd7Gj7xOIE4lU+I1yzQmdLL6rZqU3bUpfyB/qJnsXhC/gv0uNY9IeUfpfU4ylN75PJabQ/L9XnJ2TeJWLciCYkqeKxtOMSwgNO7fjCQMjagIDxC+/dL6GwQZSDj/mPFjsNrPoKSNQmoXadIteHg2i92OGaPF/dShcVVzUkHd9gGzkNMsGHsXusbnbZr9LlpVybN9W/S9JVhhuIhFOtSf8qL1k4E3FL9fKUSItso3vXP6L+BPcZTPCb8ANO4NqHJbkn4pXa8+LI+Ee8VJN6ZcT+6iUYVL2g9BlMo5/R1AFyZRz/c0YrWPcVPtiXwDzjmt3oOANO0WsrRpANJh0wn1ciVNkTF0AIAtUB0htRU8bVGRPby0Cv+WyKlXcKtcS0f+mI+TGKonPbPXtW3x3FmoAF+Xthx/Sf6lLtA4O0DWPhW38sEa3vrcdgfSquTDYN9uHWB9Na5Ui6WX/2 /73bnjdw ZQVY5bXQM9IbiQds6lVPHle1qb8f7ahmNXmoRF46wEtc/Uk3yAiyXtIXKIE10XULdrZvn2/fMkdbLSuy+qNqyc9KoToD19Sik+2UL1KoawxryUozRooBh+CKnPT7EtUDh4UtISOkh8nPoq2Cr92DHEahXj0bYf+GSo86roUMH7EyVvz7xqC8orz1Tlogq7Yg4vS3uc6gTjin5r50bOBcj5G/9qfaNtCDhI0EnAlWNm3ZZuSzHu2pfDvr1NzIUGlacqAUm78FgcsxYDsA= 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 b87d01660412..a3825ce81102 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 4898e10c569a..a91906b28835 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1301,31 +1301,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 */ @@ -1354,6 +1362,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