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 9B2C9C54EED for ; Mon, 30 Jan 2023 13:35:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 268C66B0072; Mon, 30 Jan 2023 08:35:54 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 217AA6B0073; Mon, 30 Jan 2023 08:35:54 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1071D6B0074; Mon, 30 Jan 2023 08:35:54 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 015696B0072 for ; Mon, 30 Jan 2023 08:35:53 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id D92431A054D for ; Mon, 30 Jan 2023 13:35:53 +0000 (UTC) X-FDA: 80411563386.01.C0241B9 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf28.hostedemail.com (Postfix) with ESMTP id 32572C0015 for ; Mon, 30 Jan 2023 13:35:50 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=RCSYUQl6; spf=none (imf28.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=1675085751; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=+QFUVzoJ/GrRAscHWJ3Cto7l5mrwplBY2AIC5R6mhOg=; b=udjbJaURMGpf4lY1oMm3cafajYru85+l46zPLYIcjn1U47QlEtU8783fPMux5KAmPH6gBn ytMZIR+KdadhACr0ilH9tmkPnfKEVBc8Yb55h1AGPxw6aKpcCspWL1ReJ0946mXdCyagR/ tqhrSK6gUHls4N7+N346miEbGBUxj7M= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=RCSYUQl6; spf=none (imf28.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=1675085751; a=rsa-sha256; cv=none; b=Im/DQyWEfENTC3Rr2Hk8DottQMzCYMkg2nchMacibmsR2Q4dQP/3V1J8Iud/RrJCuW/fBH DYtxfQd2b7coUlQ/gPnvjECgWuyMXXmgImdll/wI63BVzg0zS752pKibqEgyeA3tkrMU6F LjMaA7O9UdLb084sQdTB34zle/ndMQk= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=+QFUVzoJ/GrRAscHWJ3Cto7l5mrwplBY2AIC5R6mhOg=; b=RCSYUQl6dkNqU3fIXwRutuaEtb q0P1nIcDPdmsltXU39O+DVSNfpbIc8v8YeAjvxMBHJqOcf+JG8GWVfO9KxIhzXMsnd1Vo8GbKovmj 2YyiuCWwxFV+1eS1W+D065Rer4nH+jIj7GEmN3vI4nLOZiyDIdEJwJ06ODQZfCk6Gszyj4jfvReI9 nYf4o4Jp5bGOqJVacUrRn/Umg02tE4RQpChPlqBZRYZb20URMFpijgP2mtGQiwG4PmLhXIPHJ0Ia/ K/3YigNsqK0CAtvHyi7polfEm+rCRKcvOjqEZrH1J/Qd+xdlDekUKLJf+bgTjwuSQhiXvdpUqde8L Ke0ja14w==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pMUK2-00AOGA-1I; Mon, 30 Jan 2023 13:35:46 +0000 Date: Mon, 30 Jan 2023 13:35:45 +0000 From: Matthew Wilcox To: Yin Fengwei Cc: david@redhat.com, linux-mm@kvack.org, dave.hansen@intel.com, tim.c.chen@intel.com, ying.huang@intel.com Subject: Re: [RFC PATCH 2/5] filemap: do file page mapping with folio granularity Message-ID: References: <20230130125504.2509710-1-fengwei.yin@intel.com> <20230130125504.2509710-3-fengwei.yin@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230130125504.2509710-3-fengwei.yin@intel.com> X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 32572C0015 X-Stat-Signature: ib1htryiib7sdcs4nwkioif46e79967w X-HE-Tag: 1675085750-846378 X-HE-Meta: U2FsdGVkX188KC5KxEH/2C/eF7XPPDNPH30sKMQ9HUGh6nfELwEtxP/DBbp4LrEhhc8EUqhdzLaV7cOe3fANRAhIq0MKqJEL+CJHmG4PnpCM/3XfzKIgUNY7ZTXJjkCiMHVCQutGbubu+itUSs14cE0Ptwfpau8HKwMET4egaoLES/PhBrcbdUQarHPN1KcfVxuK117g4d0T79EHD4Pd3vD6vsEOU8oZq6EWJ7MDsLz6nmbdt5+Q3Zp0FJ7bKoy8hH4BTRSx47yC2clzELxVheyflZ1rzhuztRZma5EE+lSCUj08umaIwIRkyd/bjMfeGoXgDmU7ZPDvi5jh/figOsaL1Abj9LQAkIX8aADQy50Ye6Dl8cYTvL4m1kacJPbyInMVZrBedZqpNUGSDojaw66DdPzBlzLqUNcKLFIO7aL9e+4OLsfoMeWe159dPMekxa+X873dgx2qcX23hsbs3EivzcHqM1CK4Qv4OCymkNpVq1HoEkn3Or0k4OhpKLC52ewlh/ovOmQPZ0EexEp99NR/ncEgKGOFeA9jlh/qtPJ3CsWNcPdjeJxGk0UQsXqCjKDdPFuugtJgrsO/cy1+Msf+VBrdWiYm1JRawwFBzBhKRav9y7MtmKrLGuNpaUW3XKcoiupDmzC/qYG8ylhxoM3TaJeeKg8ewjCu1sFC1s6bd2q9BK+kZHLBX9HEqe6Ln0W2DBlirScQ4vpbiS/nmkpoSgz+VnFEeDxgDAZ0o6yId0ErDwJByv2MekozeBNwQ1iUhRZCLwrdLJUTteDUd3axEj6QMcc4FMoQTmsXqmWlm92n2KaPRCWSOsbZXYpAVIsZ7FJhh53IrEtGqp1HQaqbssdPBf4TSpwweqDTQNMdahaBnl/FWaPLYMpf4tZEUTHP465I7ETNGfkL3/WNiTMJW+Qvnf6i726udHaYmm6IX4sxhtDbQWy7QglkWCxncgEqZCW5hncSzDzVzxO UtoeOBtq WtzffMEmCbPbcmihrHyMJ2q9KGgoDMoD6GOjzgR3DEiTM0FgNFFEwSl7E4jsZU12m7C1mnZPz/hk5jUK4FlhcphIcJ41qHKCMYHEJz/xipVR5u1cOliJG9LigXkHlQ0FGrhfUdZ93opriEsps/JYCX2Za4kgEgCEeWe+dnZeCmsDq2No= 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 Mon, Jan 30, 2023 at 08:55:01PM +0800, Yin Fengwei wrote: > 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); > } > > + I'd remove this blank line, we typically only have one blank line between functions. > +static vm_fault_t filemap_map_folio_range(struct vm_fault *vmf, > + struct folio *folio, struct page *page, unsigned long addr, > + int len) I see this under-indentation in other parts of the mm and it drives me crazy. Two tabs to indent the arguments please, otherwise they look like part of the function. Also, 'len' is ambiguous. I'd call this 'nr' or 'nr_pages'. Also it should be an unsigned int. > +{ > + 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; Also make these unsigned. > - /* > - * 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. > - */ I'd rather not lose this comment; can you move it into filemap_map_folio_range() please? > - 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; That indentation is also confusing. Try this: if (filemap_map_folio_range(vmf, folio, page, addr, len) == VM_FAULT_NOPAGE) ret = VM_FAULT_NOPAGE; Except there's an easier way to write it: ret |= filemap_map_folio_range(vmf, folio, page, addr, len); Thanks for doing this! Looks so much better and performs better!