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 E10D4C61DA4 for ; Wed, 15 Mar 2023 13:34:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 27D266B0075; Wed, 15 Mar 2023 09:34:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 22D506B0078; Wed, 15 Mar 2023 09:34:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0CE136B007B; Wed, 15 Mar 2023 09:34:47 -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 F24716B0075 for ; Wed, 15 Mar 2023 09:34:46 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id BDCC9C10F5 for ; Wed, 15 Mar 2023 13:34:46 +0000 (UTC) X-FDA: 80571227772.16.649D1A5 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf27.hostedemail.com (Postfix) with ESMTP id E12DA40005 for ; Wed, 15 Mar 2023 13:34:43 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf27.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678887284; 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; bh=i7AawL0kyLtiQPJp+Jv5yNfItdz1GAgpRgNIh3UrO2g=; b=aDLZGv0TM2CHEbp3BZbZANuPghgrPun4PneMPqcSmmzAtueeVIYf3IE1NuSd6AcQHtuuhN GwxKmHZlT/V703+F0Z6pzKUBGokIA8HxQ56P+gkDdpzwJy51NcaNTRFM3mUfMrwRiVH0D2 RWaW2cz97OqJf0sa8w5sU2YluXcdXDk= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf27.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678887284; a=rsa-sha256; cv=none; b=RFGLbtP6MJgPlmA69jYtA70YHgkeRM/YsO6yiHAuF3VM14xyvDkWEFAVQMjvp0lqLy9ces uC2hVZlj2bRg+FNxI1ZYfpI8ErjOty3AIN6LGKEoiHNgp/QpjWfLiXAKyzqgb8QiqThPu/ j3MGYtuStLCWsyZq9PT4aZZkCmirKVM= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 831762F4; Wed, 15 Mar 2023 06:35:26 -0700 (PDT) Received: from [10.57.64.236] (unknown [10.57.64.236]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id F15173F8C6; Wed, 15 Mar 2023 06:34:41 -0700 (PDT) Message-ID: <387dc921-de2b-f244-985c-d1e6336d5909@arm.com> Date: Wed, 15 Mar 2023 13:34:40 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Subject: Re: [PATCH v4 34/36] rmap: add folio_add_file_rmap_range() Content-Language: en-US To: "Matthew Wilcox (Oracle)" , linux-arch@vger.kernel.org Cc: Yin Fengwei , linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20230315051444.3229621-1-willy@infradead.org> <20230315051444.3229621-35-willy@infradead.org> From: Ryan Roberts In-Reply-To: <20230315051444.3229621-35-willy@infradead.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: E12DA40005 X-Rspam-User: X-Stat-Signature: mceuozpotxoc7e384h7h8tam8qna9pz4 X-HE-Tag: 1678887283-432587 X-HE-Meta: U2FsdGVkX1+1Jtv3W5hp+qSSBdXfrkSf4vOj1dpQ9Qeqa3H3WtFg7k81bwsltupJ/tdFQg5elogiVw/WbsBT16X04Kpe5OxAIlH2n9oAjNFvKv+ca4JwwLVYDtKxikm+Nd+/zyhMNFp+cXFIUbHL4nXQ3J9Kg7SWK96JRF6y2goj2K7hg/2An1cZnqiE3CX6NmLYbCkw0123qTBoNunG6v1zPwDXJjp7YVCiMhFbtsS7h2CzJtkwe8Ry/C4dUxm8h+s0KtaDQTYX6JlmJw2br2vlwbURqowLxIuIU0yt8ZtLFgntPvA5vqZWkH41FR/va3/akhZUQA9qGmXFIDnKw+0aC36QzADj34pAVQkJnm+IUk/I5oMIRh9Zb3mGrRR5rs2B4hB12EovkuLc6UIze5JDdRreBa30gsl+1v32WNrSyeagsjSdN90AShRNZandJa1AKMui91ALE/uD3u/BKqr91Z9j0x//3EkqFQH49zCWirMjFUTSeTOEQVxnLr0TeI1zeDeB4MQFf/oxWylwxYujA+M3llXjItiMPoInnSaallGOcuGQe0olLQGSIgI8alK6L+WPAOCB9w/AvYVnqkKKtsqMePQVJ5rilq6pcduPQMaw2OBwmvK1Z8VW+Q/z1ElBYJL5oGbC25jV09xYSYxc/K2/A6+4c2TPMGfEtZigSVDL3gmFC3bpX4lJTgPHQC6VSEga44acEtqfy48JCKwFv5Qx89B2FiFiiAaP5wq5cDTHU0w+gZK/lZae20Ww0aHqmPO5skuKLxr70bCdTNJ5M5bqRKHZhWqUFWFRmc2nGCNefNLjN0A6mws4JGV1xNnoprvp7LamS6dY5G+hJ3izAPcrwx6acd6r2EjnoMC/LZKIlJ9Q3BnH9/TaYgAFAHcvRN7Fb13Q87KbnmS+jCFhkgFVEeRMpMY37VkR8AMUaBGNcxqMeFShUregeXyANjDmegnyUWfJtCL5oNS Enm/EsWH gqDKPm/aLuz0fGoTK+WAp2MUV5dobZXX7XadgeZdwSp9DU+zDU2frKb6h33PFubE7I06B7DQdivuaxmEXCEMD6F0JCMbAzv5rB+2xROUy7Oad9HuSTUmbBTZR5555y+d8AtOhictTnvUU5JNg1U2cspAoOUZ5fsQgB2SmTYeUTr/kqDsPHJnFiJcA9yZpO89JqDexLnX9fB8V3kh8N/yY8XeIC2Z6Pjg3R4Hy8hZNTHN7jdL8jqao3ZXwsjwt1IKr9JKOczc8u5YJ8n2I9AOVbLL59ZU+xz4aBjhgKf2MUn5/Gl0YWSiIKmGCbqa5ud1FkLhX1a0Wv3hpu3+k/+mx6E9/5OsJz+U9xhSJ+rKhrmzw2xQ= 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 15/03/2023 05:14, Matthew Wilcox (Oracle) wrote: > 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); This still contains the typo that Yin Fengwei spotted in the previous version: https://lore.kernel.org/linux-mm/20230228213738.272178-1-willy@infradead.org/T/#m84673899e25bc31356093a1177941f2cc35e5da8 FYI, I'm seeing a perf regression of about 1% when compiling the kernel on Ampere Altra (arm64) with this whole series on top of v6.3-rc1 (In a VM using ext4 filesystem). Looks like instruction aborts are taking much longer and a selection of syscalls are a bit slower. Still hunting down the root cause. Will report once I have conclusive diagnosis. Thanks, Ryan > + } > + > + 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