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 6B231C61DA4 for ; Mon, 30 Jan 2023 12:53:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AC4B36B0074; Mon, 30 Jan 2023 07:53:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A75576B0075; Mon, 30 Jan 2023 07:53:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 93D3C6B0078; Mon, 30 Jan 2023 07:53:34 -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 8752A6B0074 for ; Mon, 30 Jan 2023 07:53:34 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 4ED5A160A44 for ; Mon, 30 Jan 2023 12:53:34 +0000 (UTC) X-FDA: 80411456748.18.4409E8B Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by imf23.hostedemail.com (Postfix) with ESMTP id 399EB140015 for ; Mon, 30 Jan 2023 12:53:31 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=MSBFOPKU; spf=pass (imf23.hostedemail.com: domain of fengwei.yin@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=fengwei.yin@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1675083212; 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=mTJmSjZ+7gn5S8kEU+BvOEVTeQw3rq/jH7wAHhnOJqs=; b=rxieJvkU1H39vHdCBqjdJoykbQbG1ZUFOPLVauIQm82H21erYEsTGQWstcvNOYLxG2uJfu B9jJRME+TobFWeJfUQQmUMcNanC1xlcg1WY1pE44Ty4MeIw5gZGHai/dKyJqeXp/fbxqV6 k4vhEslAS0OB9hJX09KlPIVJh7W+Gmk= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=MSBFOPKU; spf=pass (imf23.hostedemail.com: domain of fengwei.yin@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=fengwei.yin@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675083212; a=rsa-sha256; cv=none; b=C96wY32cCKWMDAlff+riy1IBuc2crIrFky3mzITY6iTGx+HrXe3YwlBtlL/4yDPtCA9gvj Aqtzm9Y19S2pLy15gB2scBm7WSsnjLRGiU6bwDLa6e3EBOFCsXHvEpBicUVk99jtVpbyDB /1pmBOCdyyCFZI9tBWuvIPXj0YUqwdc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675083212; x=1706619212; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kXn7UAz+1IVs/Rr4mbkvdX6G6cuSg/lPsM7U+xkLJeg=; b=MSBFOPKUgDoNOu/eKAEAB5Ro23wuAlqaeYLOMNHpexcrnhgRECIup7Wv SZdfcdRaqKPPYEiIxJdPic88oB0nQk5gh4HxqzXjt7PXy9wWojr3hntVi 2a/G6D48rbtajzUvru6QK32UfH9Wjr6DbWlz3TPez2fKUsx9cLUWSihv6 QIheBRiq7G/j5MzlMa2659eOXr8TD9POgO0xfxk1HaKeI/90F3DkwAEJa ftwikrlJCT3KeGIhgCF3aOxCA0TARhFVyKwDeBTXRXUI85RZec1AM7OuY Y4tlLNsVDkXQGgl2r95Ay4h+fSXlBOHDlu6owDPYSKtm9hZrJ+JPxipE6 Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10605"; a="328823667" X-IronPort-AV: E=Sophos;i="5.97,258,1669104000"; d="scan'208";a="328823667" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jan 2023 04:53:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10605"; a="614014992" X-IronPort-AV: E=Sophos;i="5.97,258,1669104000"; d="scan'208";a="614014992" Received: from fyin-dev.sh.intel.com ([10.239.159.32]) by orsmga003.jf.intel.com with ESMTP; 30 Jan 2023 04:53:19 -0800 From: Yin Fengwei To: willy@infradead.org, david@redhat.com, linux-mm@kvack.org Cc: dave.hansen@intel.com, tim.c.chen@intel.com, ying.huang@intel.com, fengwei.yin@intel.com Subject: [RFC PATCH 2/5] filemap: do file page mapping with folio granularity Date: Mon, 30 Jan 2023 20:55:01 +0800 Message-Id: <20230130125504.2509710-3-fengwei.yin@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230130125504.2509710-1-fengwei.yin@intel.com> References: <20230130125504.2509710-1-fengwei.yin@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: fktbth4btqoywtbwpnrkcox411sd51fd X-Rspamd-Queue-Id: 399EB140015 X-HE-Tag: 1675083211-256953 X-HE-Meta: U2FsdGVkX18Q/7wtC6Ct53l0arjDD8vDExcqILZ4vwEBDi9PSppQuN3AcEPUR0eu8XeZHBbpjEa5j6CUsxyyVpMXotdxEsEtu49jTH+wxxB9XwJwESiJJS0n970AwUdmKXpQvbmsFWq0CNQ9pRBwxtFV2jFFhCrjiqDTdbgNvD2AOVmWh2wb/RCHioXHwQOSXlNnJR1jH+AVjse2/f58AvLm4aWoW9IlYxOkbpOGGMcRI56NAtEGdGrjuOk0AQfxrzPUpcOCJ2ivbchifwhNyPMjIWYk7TXbwy3qc0JQS9NRtVsbXgOoWv98Lh2tzE+YqC9m+iUJueXbr/XTxyLLa/lKA78+RB66Gp/XzytNa6aPjk4u/mnVQ8U/Ly/btDAa9/djjjSEDQzoARaLzx6yRDyBuh/Y+/xhLKXRWrlda/nFKPJQj2PglRobg1ArknKM6a//pDq9+HmySTN245gswbApTtfsOFurLa/UhhDHt4Sko5BafwFqt0Ipm+cpzIRjaEjgfyZ3CQDiYHyGK6Nv+ZG+eY/hNGPlu3hYv4Q/ZkyByO9Cuq9SI0JawCuZCkByHD3ygRqFx+1DOsTpGdLBOqvWy1Y3dTT9Wuq/kzBUOWuNZQfC63m/iAOk4DvzPSKqb4zP6TfxXW0gcxT9MUWXsW790+T0u+Zqi7Stn+v17NBhQlCX8TKsbnSiI57UhiT20nDNB6JLBXOs6CynbrG5KrP17MfYZaOaXmCtg7/CjGGtZYm7LpqGlVHqUUk6msdbZ3lhI1wolh+2R82CXtnXbBREgUW2q3rO+ts5hZmZTv6fR+r77EutGRrkKoC7Sq4r+yu3h7IeSdV4IXDyPs56A00L62hC9pnO3qhdQ4OTOmzs6tPfWEhiPzHHQfhh1+ddFNQEZCqjYhd1Mf8pEYuSjX9WdVcf0o3AMPyPq7gTDVykDXtWONqJVfUe7+fGkJD7IRL0oblc/2ErAmZZEzb 4LRbUGe4 i099dDF3hJbGKibh67l2pbMc+nntiMvUnPK3sO1z43Wi1FcrBzIG1yEKizXDmh2sCh3hb67OGSY3/PPJ94ye/AUh90Xgf43+5+Fj5pF578M4xSGX1Oy9mozfegDPJbhXbI74ib93rg2ONfQk/nCu+L+ApGqJU9mtF1j2Xk6WIW8SRXVU= 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: Add function to do file page mapping based on folio and update filemap_map_pages() to use new function. So the filemap page mapping will deal with folio granularity instead of page granularity. This allow batched folio refcount update. Signed-off-by: Yin Fengwei --- mm/filemap.c | 82 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 48 insertions(+), 34 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index c915ded191f0..fe0c226c8b1e 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3351,6 +3351,43 @@ static inline struct folio *next_map_page(struct address_space *mapping, mapping, xas, end_pgoff); } + +static vm_fault_t filemap_map_folio_range(struct vm_fault *vmf, + struct folio *folio, struct page *page, unsigned long addr, + int len) +{ + vm_fault_t ret = 0; + struct vm_area_struct *vma = vmf->vma; + struct file *file = vma->vm_file; + unsigned int mmap_miss = READ_ONCE(file->f_ra.mmap_miss); + int ref_count = 0, count = 0; + + do { + if (PageHWPoison(page)) + continue; + + if (mmap_miss > 0) + mmap_miss--; + + if (!pte_none(*vmf->pte)) + continue; + + if (vmf->address == addr) + ret = VM_FAULT_NOPAGE; + + ref_count++; + + do_set_pte(vmf, page, addr); + update_mmu_cache(vma, addr, vmf->pte); + + } while (vmf->pte++, page++, addr += PAGE_SIZE, ++count < len); + + folio_ref_add(folio, ref_count); + WRITE_ONCE(file->f_ra.mmap_miss, mmap_miss); + + return ret; +} + vm_fault_t filemap_map_pages(struct vm_fault *vmf, pgoff_t start_pgoff, pgoff_t end_pgoff) { @@ -3361,9 +3398,9 @@ vm_fault_t filemap_map_pages(struct vm_fault *vmf, unsigned long addr; XA_STATE(xas, &mapping->i_pages, start_pgoff); struct folio *folio; - struct page *page; unsigned int mmap_miss = READ_ONCE(file->f_ra.mmap_miss); vm_fault_t ret = 0; + int len = 0; rcu_read_lock(); folio = first_map_page(mapping, &xas, end_pgoff); @@ -3378,45 +3415,22 @@ vm_fault_t filemap_map_pages(struct vm_fault *vmf, addr = vma->vm_start + ((start_pgoff - vma->vm_pgoff) << PAGE_SHIFT); vmf->pte = pte_offset_map_lock(vma->vm_mm, vmf->pmd, addr, &vmf->ptl); do { -again: - page = folio_file_page(folio, xas.xa_index); - if (PageHWPoison(page)) - goto unlock; - - if (mmap_miss > 0) - mmap_miss--; + struct page *page; + unsigned long end; + page = folio_file_page(folio, xas.xa_index); addr += (xas.xa_index - last_pgoff) << PAGE_SHIFT; - vmf->pte += xas.xa_index - last_pgoff; + vmf->pte += xas.xa_index - last_pgoff - len; last_pgoff = xas.xa_index; + end = folio->index + folio_nr_pages(folio) - 1; + len = min(end, end_pgoff) - xas.xa_index + 1; - /* - * NOTE: If there're PTE markers, we'll leave them to be - * handled in the specific fault path, and it'll prohibit the - * fault-around logic. - */ - if (!pte_none(*vmf->pte)) - goto unlock; - - /* We're about to handle the fault */ - if (vmf->address == addr) + if (VM_FAULT_NOPAGE == + filemap_map_folio_range(vmf, folio, page, addr, len)) ret = VM_FAULT_NOPAGE; - do_set_pte(vmf, page, addr); - /* no need to invalidate: a not-present page won't be cached */ - update_mmu_cache(vma, addr, vmf->pte); - if (folio_more_pages(folio, xas.xa_index, end_pgoff)) { - xas.xa_index++; - folio_ref_inc(folio); - goto again; - } - folio_unlock(folio); - continue; -unlock: - if (folio_more_pages(folio, xas.xa_index, end_pgoff)) { - xas.xa_index++; - goto again; - } + xas.xa_index = end; + folio_unlock(folio); folio_put(folio); } while ((folio = next_map_page(mapping, &xas, end_pgoff)) != NULL); -- 2.30.2