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 27673C54E60 for ; Thu, 14 Mar 2024 20:44:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5A383800E3; Thu, 14 Mar 2024 16:44:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 553AB800B4; Thu, 14 Mar 2024 16:44:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3F432800E3; Thu, 14 Mar 2024 16:44:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 2E006800B4 for ; Thu, 14 Mar 2024 16:44:03 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id E270A4028D for ; Thu, 14 Mar 2024 20:44:02 +0000 (UTC) X-FDA: 81896821524.04.C9B7837 Received: from mail-vs1-f53.google.com (mail-vs1-f53.google.com [209.85.217.53]) by imf28.hostedemail.com (Postfix) with ESMTP id 2731DC000D for ; Thu, 14 Mar 2024 20:44:00 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=S5lTUjcr; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf28.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.217.53 as permitted sender) smtp.mailfrom=21cnbao@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1710449041; 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:dkim-signature; bh=wGGrg1lhI/2L7xsslkXYBnKmoL23Z9cH1zjGQvkaPfs=; b=w/W6fGkQ8BftJ/OQ09VTY3MSlIcZQll0SivouJfzvM3M0v4MY4A0cQAiiXROqEFZvC/hAG 4ldRKC2bAJvzRUYn2gzMw8ljKrXp98sz9w1CFBDZR9Mp9E7dTIEZomu2X8H087J/07W6ph 02uM9f1HOqYP/uIwDp3YqfC31Uucfko= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=S5lTUjcr; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf28.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.217.53 as permitted sender) smtp.mailfrom=21cnbao@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710449041; a=rsa-sha256; cv=none; b=UOP4zFZ9EDT5mACLw8WOI/jLREKvvMYR7FkbwftLjLJUQAWXJDrH9ocIykv62NbrL9Jp2M 27TsXmNp/NdgtIWl6UymjV2GLIBs8/VQKg+NZ3zl7rFUQS13W87AXy2IOVHPpLq89fMZUR +/jWRzxupfxZLFP+SHpJLKA17wHwmLU= Received: by mail-vs1-f53.google.com with SMTP id ada2fe7eead31-472967264e7so410314137.3 for ; Thu, 14 Mar 2024 13:44:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710449040; x=1711053840; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=wGGrg1lhI/2L7xsslkXYBnKmoL23Z9cH1zjGQvkaPfs=; b=S5lTUjcrh6RR6fLSWR881CEj3XsWIBgZSmzIH6ZPg4hlD2RlUxeW7oOP9yCEv5hyF5 e+gjeoqnYrfnItME1q7Y0bDNrsMAEFieOGwU6No/evjsz2Nk20hcydIYZ/v6jg5IdTij gUGWjoniq+mS+WKiy8bBeGmsnm0s8QTGtLW+BbnESTzk+5vG42VaSlA64yWo9Jq8FlXB ND024MUfM8JB+It67Z3ppyRFU9o8dQFuf+E+2F/ffLXIO6vdCLqJqHAzFEBKlILdvEJr mVJkRd4L2Bs8KMXl7XV0ja/p4hn5lVPRHt7Qh0czy5hBTPLnOhRR1z9Dm0wN6pnrzAXO 0TLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710449040; x=1711053840; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wGGrg1lhI/2L7xsslkXYBnKmoL23Z9cH1zjGQvkaPfs=; b=hZ1f20Z3bgJIfUFLgDijun0uZD5dx1mx9tJlluatrxc84S9TqycDFziPI85FAk6wmR OiSeGG17RCu6CC2C08h+6qpcG9cia3DLlWUz09KPsLkgg/QJpGSMW3Z+pCl31EpThC4T 5XmdzewEMPRw7a4YGe81q3jGaRxN/85eUyfzK4Q7Qn+VIVSbSzgFEpMsOShLBJ49FE2X cjTH2eij6JysHD5d0W8mmY+xfBngIUgzcj9R9pUN899ofgC4Nkasy9Kc6K5ked/uQh1v RX8fKDIDhS2F9W+VWvx++B/Z0H1NuOka8rR1S4pzjy2CeG40yGbxDUKvlIZNp6/+hYkt gAuw== X-Forwarded-Encrypted: i=1; AJvYcCVAudE1gnaGJFA4aEe3vlLJO9ISWgGdbbRyXMB/8Bx25KPFJL7T7hf+KTKOrtZgItRNZs/DKvg5W3tT5x4sR2PHA9o= X-Gm-Message-State: AOJu0YzjB3ASd06ux5uUUo+Vv+m6WvHRa/ZjqgXY/Tky7UO7xf2+RKHV cz95rUX0R0ZGmV6jf67ig2uNi7Ynw918hPda3Yfu4bWpUXoig+TJ4zGon0nruKCsygv6sLl/JZU LfqPJ9Wa6cdmSEPf+51SYOSiB+d0= X-Google-Smtp-Source: AGHT+IGnvkgGnPQjvp1Otr3ihuFdbRWX7/2EVSSEeA9X6NY3/pKenCtVqhFdCUQKoYsoaR75QtBZcrWGmVOLn6/EiVw= X-Received: by 2002:a67:eb44:0:b0:472:ee5f:9124 with SMTP id x4-20020a67eb44000000b00472ee5f9124mr1477508vso.19.1710449040087; Thu, 14 Mar 2024 13:44:00 -0700 (PDT) MIME-Version: 1.0 References: <20240304081348.197341-1-21cnbao@gmail.com> <20240304081348.197341-6-21cnbao@gmail.com> <85b59657-9660-41a2-b091-0c6ec4a6ef16@arm.com> In-Reply-To: <85b59657-9660-41a2-b091-0c6ec4a6ef16@arm.com> From: Barry Song <21cnbao@gmail.com> Date: Fri, 15 Mar 2024 09:43:48 +1300 Message-ID: Subject: Re: [RFC PATCH v3 5/5] mm: support large folios swapin as a whole To: Ryan Roberts Cc: Chuanhua Han , akpm@linux-foundation.org, linux-mm@kvack.org, chengming.zhou@linux.dev, chrisl@kernel.org, david@redhat.com, hannes@cmpxchg.org, kasong@tencent.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, mhocko@suse.com, nphamcs@gmail.com, shy828301@gmail.com, steven.price@arm.com, surenb@google.com, wangkefeng.wang@huawei.com, willy@infradead.org, xiang@kernel.org, ying.huang@intel.com, yosryahmed@google.com, yuzhao@google.com, Chuanhua Han , Barry Song Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 2731DC000D X-Stat-Signature: pe3af3csnfh84iewipsfgt5jfifgk8o1 X-HE-Tag: 1710449040-897815 X-HE-Meta: U2FsdGVkX18gRhOLTUWrbAirvYr13UPYMV2sCTWdPyoncI6ldbsvhP0oKjI+mhz67AOoh+vKL0dX3bojNDY6GACCT+9kTXlTevtxb8LGezhPAYi//u/TwM5qOPNV0c/iw1NATV+qvmDO7Ee2kmc858BzCiDvhPO0confDp5+W0WtfCuHnQZGyTBSYepXD73tcnKhN5LZ9yrp/+WyHg60lclPTw6gUcVFcHAuhsyVX84RzzLBpDTdb1uTmG7AIOnmHSNlzPcTegXiY1KChCa3hD50sAqhbKn9KB9TAAWnn8NBGrySOl0uubqjifLT1XdT+e1H1DlFbu5ds7v47jsvZx4oi5YIMbR9dwCC/GXfwQX1560O6mWnu/RqVAHaBHTsaghhCiqhU+FmSbaWAqwbS1iLhL4nxChlUrIhY0QXe+1YWt/uUNOpnrnzqlbI79tOdRvG+XjA4X06/T5nyQWoST16x9sYEBT3ACdm33VHyqXQ1Qy/9LVmssBtmU0DND8pgd6iKOaXvR7yXh2C6XTjoqeh30szQGRtaz/u83r2d+UJmWHqyABj2W7emdeTe604iC+CVCCSGkgxeQ/FJWArkRcIzkOQ9tlP0vvy4+FXu1xsTXWTU65Hq2U76iZEmwI23K/wFAvr3yPb9CLLs/6XWrU6Mp4uzBS/HwTeFG+urNkikfuSNW6UdJozz+dmLZ4WlO9ebQDXylRjhOjLLYu70A1TxO9Wv0PEVyxiiwQJghzceACa0ExFD/UpK96IFDvk4xAbpCyBOnf4aOAd0rCKTYMn7jZ7+rJtXDxW7OlGwXALtlCO2nofbfsSy6iWg+CidQ3vSJ0wh4nVaCxrI3TUaPOh8FZdjaXA+FcpL5R9I0lTJ7GblizC/ANE4zvGNZl1SW9/AHoBh+wFbKWd41/3+V6mkfAEZ4oWtqT77P8owdLiGoaNls/x5TU8OyoFC1oUPLVV5XaiXKvYxlrORwX m9AB/tpc FgP0CS9l4up1DpsjanUhpUjAFHuwnQ1idro28 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: List-Subscribe: List-Unsubscribe: On Fri, Mar 15, 2024 at 2:57=E2=80=AFAM Ryan Roberts = wrote: > > On 14/03/2024 12:56, Chuanhua Han wrote: > > Ryan Roberts =E4=BA=8E2024=E5=B9=B43=E6=9C=8813= =E6=97=A5=E5=91=A8=E4=B8=89 00:33=E5=86=99=E9=81=93=EF=BC=9A > >> > >> On 04/03/2024 08:13, Barry Song wrote: > >>> From: Chuanhua Han > >>> > >>> On an embedded system like Android, more than half of anon memory is > >>> actually in swap devices such as zRAM. For example, while an app is > >>> switched to background, its most memory might be swapped-out. > >>> > >>> Now we have mTHP features, unfortunately, if we don't support large f= olios > >>> swap-in, once those large folios are swapped-out, we immediately lose= the > >>> performance gain we can get through large folios and hardware optimiz= ation > >>> such as CONT-PTE. > >>> > >>> This patch brings up mTHP swap-in support. Right now, we limit mTHP s= wap-in > >>> to those contiguous swaps which were likely swapped out from mTHP as = a > >>> whole. > >>> > >>> Meanwhile, the current implementation only covers the SWAP_SYCHRONOUS > >>> case. It doesn't support swapin_readahead as large folios yet since t= his > >>> kind of shared memory is much less than memory mapped by single proce= ss. > >>> > >>> Right now, we are re-faulting large folios which are still in swapcac= he as a > >>> whole, this can effectively decrease extra loops and early-exitings w= hich we > >>> have increased in arch_swap_restore() while supporting MTE restore fo= r folios > >>> rather than page. On the other hand, it can also decrease do_swap_pag= e as > >>> PTEs used to be set one by one even we hit a large folio in swapcache= . > >>> > >>> Signed-off-by: Chuanhua Han > >>> Co-developed-by: Barry Song > >>> Signed-off-by: Barry Song > >>> --- > >>> mm/memory.c | 250 ++++++++++++++++++++++++++++++++++++++++++++------= -- > >>> 1 file changed, 212 insertions(+), 38 deletions(-) > >>> > >>> diff --git a/mm/memory.c b/mm/memory.c > >>> index e0d34d705e07..501ede745ef3 100644 > >>> --- a/mm/memory.c > >>> +++ b/mm/memory.c > >>> @@ -3907,6 +3907,136 @@ static vm_fault_t handle_pte_marker(struct vm= _fault *vmf) > >>> return VM_FAULT_SIGBUS; > >>> } > >>> > >>> +/* > >>> + * check a range of PTEs are completely swap entries with > >>> + * contiguous swap offsets and the same SWAP_HAS_CACHE. > >>> + * pte must be first one in the range > >>> + */ > >>> +static bool is_pte_range_contig_swap(pte_t *pte, int nr_pages) > >>> +{ > >>> + int i; > >>> + struct swap_info_struct *si; > >>> + swp_entry_t entry; > >>> + unsigned type; > >>> + pgoff_t start_offset; > >>> + char has_cache; > >>> + > >>> + entry =3D pte_to_swp_entry(ptep_get_lockless(pte)); > >> > >> Given you are getting entry locklessly, I expect it could change under= you? So > >> probably need to check that its a swap entry, etc. first? > > The following non_swap_entry checks to see if it is a swap entry. > > No, it checks if something already known to be a "swap entry" type is act= ually > describing a swap entry, or a non-swap entry (e.g. migration entry, hwpoi= son > entry, etc.) Swap entries with type >=3D MAX_SWAPFILES don't actually des= cribe swap: > > static inline int non_swap_entry(swp_entry_t entry) > { > return swp_type(entry) >=3D MAX_SWAPFILES; > } > > > So you need to do something like: > > pte =3D ptep_get_lockless(pte); > if (pte_none(pte) || !pte_present(pte)) > return false; Indeed, I noticed that a couple of days ago, but it turned out that it didn't cause any issues because the condition following 'if (swp_offset(entry) !=3D start_offset + i)' cannot be true :-) I do agree it needs a fix here. maybe by if (!is_swap_pte(pte)) return false? > entry =3D pte_to_swp_entry(pte); > if (non_swap_entry(entry)) > return false; > ... > > >> > >>> + if (non_swap_entry(entry)) > >>> + return false; > >>> + start_offset =3D swp_offset(entry); > >>> + if (start_offset % nr_pages) > >>> + return false; > >>> + > >>> + si =3D swp_swap_info(entry); > >> > >> What ensures si remains valid (i.e. swapoff can't happen)? If swapoff = can race, > >> then swap_map may have been freed when you read it below. Holding the = PTL can > >> sometimes prevent it, but I don't think you're holding that here (you'= re using > >> ptep_get_lockless(). Perhaps get_swap_device()/put_swap_device() can h= elp? > > Thank you for your review,you are righit! this place reaally needs > > get_swap_device()/put_swap_device(). > >> > >>> + type =3D swp_type(entry); > >>> + has_cache =3D si->swap_map[start_offset] & SWAP_HAS_CACHE; > >>> + for (i =3D 1; i < nr_pages; i++) { > >>> + entry =3D pte_to_swp_entry(ptep_get_lockless(pte + i)); > >>> + if (non_swap_entry(entry)) > >>> + return false; > >>> + if (swp_offset(entry) !=3D start_offset + i) > >>> + return false; > >>> + if (swp_type(entry) !=3D type) > >>> + return false; > >>> + /* > >>> + * while allocating a large folio and doing swap_read_f= olio for the > >>> + * SWP_SYNCHRONOUS_IO path, which is the case the being= faulted pte > >>> + * doesn't have swapcache. We need to ensure all PTEs h= ave no cache > >>> + * as well, otherwise, we might go to swap devices whil= e the content > >>> + * is in swapcache > >>> + */ > >>> + if ((si->swap_map[start_offset + i] & SWAP_HAS_CACHE) != =3D has_cache) > >>> + return false; > >>> + } > >>> + > >>> + return true; > >>> +} > >> > >> I created swap_pte_batch() for the swap-out series [1]. I wonder if th= at could > >> be extended for the SWAP_HAS_CACHE checks? Possibly not because it ass= umes the > >> PTL is held, and you are lockless here. Thought it might be of interes= t though. > >> > >> [1] https://lore.kernel.org/linux-mm/20240311150058.1122862-3-ryan.rob= erts@arm.com/ > >> > > Thanks. It's probably simily to ours, but as you said we are lockless > > here, and we need to check has_cache. > >>> + > >>> +#ifdef CONFIG_TRANSPARENT_HUGEPAGE > >>> +/* > >>> + * Get a list of all the (large) orders below PMD_ORDER that are ena= bled > >>> + * for this vma. Then filter out the orders that can't be allocated = over > >>> + * the faulting address and still be fully contained in the vma. > >>> + */ > >>> +static inline unsigned long get_alloc_folio_orders(struct vm_fault *= vmf) > >>> +{ > >>> + struct vm_area_struct *vma =3D vmf->vma; > >>> + unsigned long orders; > >>> + > >>> + orders =3D thp_vma_allowable_orders(vma, vma->vm_flags, false, = true, true, > >>> + BIT(PMD_ORDER) - 1); > >>> + orders =3D thp_vma_suitable_orders(vma, vmf->address, orders); > >>> + return orders; > >>> +} > >>> +#endif > >>> + > >>> +static struct folio *alloc_swap_folio(struct vm_fault *vmf) > >>> +{ > >>> + struct vm_area_struct *vma =3D vmf->vma; > >>> +#ifdef CONFIG_TRANSPARENT_HUGEPAGE > >>> + unsigned long orders; > >>> + struct folio *folio; > >>> + unsigned long addr; > >>> + pte_t *pte; > >>> + gfp_t gfp; > >>> + int order; > >>> + > >>> + /* > >>> + * If uffd is active for the vma we need per-page fault fidelit= y to > >>> + * maintain the uffd semantics. > >>> + */ > >>> + if (unlikely(userfaultfd_armed(vma))) > >>> + goto fallback; > >>> + > >>> + /* > >>> + * a large folio being swapped-in could be partially in > >>> + * zswap and partially in swap devices, zswap doesn't > >>> + * support large folios yet, we might get corrupted > >>> + * zero-filled data by reading all subpages from swap > >>> + * devices while some of them are actually in zswap > >>> + */ > >>> + if (is_zswap_enabled()) > >>> + goto fallback; > >>> + > >>> + orders =3D get_alloc_folio_orders(vmf); > >>> + if (!orders) > >>> + goto fallback; > >>> + > >>> + pte =3D pte_offset_map(vmf->pmd, vmf->address & PMD_MASK); > >> > >> Could also briefly take PTL here, then is_pte_range_contig_swap() coul= d be > >> merged with an enhanced swap_pte_batch()? > > Yes, it's easy to use a lock here, but I'm wondering if it's > > necessary, because when we actually set pte in do_swap_page, we'll > > hold PTL to check if the pte changes. > >> > >>> + if (unlikely(!pte)) > >>> + goto fallback; > >>> + > >>> + /* > >>> + * For do_swap_page, find the highest order where the aligned r= ange is > >>> + * completely swap entries with contiguous swap offsets. > >>> + */ > >>> + order =3D highest_order(orders); > >>> + while (orders) { > >>> + addr =3D ALIGN_DOWN(vmf->address, PAGE_SIZE << order); > >>> + if (is_pte_range_contig_swap(pte + pte_index(addr), 1 <= < order)) > >>> + break; > >>> + order =3D next_order(&orders, order); > >>> + } > >> > >> So in the common case, swap-in will pull in the same size of folio as = was > >> swapped-out. Is that definitely the right policy for all folio sizes? = Certainly > >> it makes sense for "small" large folios (e.g. up to 64K IMHO). But I'm= not sure > >> it makes sense for 2M THP; As the size increases the chances of actual= ly needing > >> all of the folio reduces so chances are we are wasting IO. There are s= imilar > >> arguments for CoW, where we currently copy 1 page per fault - it proba= bly makes > >> sense to copy the whole folio up to a certain size. > > For 2M THP, IO overhead may not necessarily be large? :) > > 1.If 2M THP are continuously stored in the swap device, the IO > > overhead may not be very large (such as submitting bio with one > > bio_vec at a time). > > 2.If the process really needs this 2M data, one page-fault may perform > > much better than multiple. > > 3.For swap devices like zram,using 2M THP might also improve > > decompression efficiency. > > > > On the other hand, if the process only needs a small part of the 2M > > data (such as only frequent use of 4K page, the rest of the data is > > never accessed), This is indeed give a lark to catch a kite! :( > > Yes indeed. It's not always clear-cut what the best thing to do is. It wo= uld be > good to hear from others on this. > > >> > >> Thanks, > >> Ryan > >> > >>> + > >>> + pte_unmap(pte); > >>> + > >>> + /* Try allocating the highest of the remaining orders. */ > >>> + gfp =3D vma_thp_gfp_mask(vma); > >>> + while (orders) { > >>> + addr =3D ALIGN_DOWN(vmf->address, PAGE_SIZE << order); > >>> + folio =3D vma_alloc_folio(gfp, order, vma, addr, true); > >>> + if (folio) > >>> + return folio; > >>> + order =3D next_order(&orders, order); > >>> + } > >>> + > >>> +fallback: > >>> +#endif > >>> + return vma_alloc_folio(GFP_HIGHUSER_MOVABLE, 0, vma, vmf->addre= ss, false); > >>> +} > >>> + > >>> + > >>> /* > >>> * We enter with non-exclusive mmap_lock (to exclude vma changes, > >>> * but allow concurrent faults), and pte mapped but not yet locked. > >>> @@ -3928,6 +4058,9 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) > >>> pte_t pte; > >>> vm_fault_t ret =3D 0; > >>> void *shadow =3D NULL; > >>> + int nr_pages =3D 1; > >>> + unsigned long start_address; > >>> + pte_t *start_pte; > >>> > >>> if (!pte_unmap_same(vmf)) > >>> goto out; > >>> @@ -3991,35 +4124,41 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) > >>> if (!folio) { > >>> if (data_race(si->flags & SWP_SYNCHRONOUS_IO) && > >>> __swap_count(entry) =3D=3D 1) { > >>> - /* > >>> - * Prevent parallel swapin from proceeding with > >>> - * the cache flag. Otherwise, another thread ma= y > >>> - * finish swapin first, free the entry, and swa= pout > >>> - * reusing the same entry. It's undetectable as > >>> - * pte_same() returns true due to entry reuse. > >>> - */ > >>> - if (swapcache_prepare(entry)) { > >>> - /* Relax a bit to prevent rapid repeate= d page faults */ > >>> - schedule_timeout_uninterruptible(1); > >>> - goto out; > >>> - } > >>> - need_clear_cache =3D true; > >>> - > >>> /* skip swapcache */ > >>> - folio =3D vma_alloc_folio(GFP_HIGHUSER_MOVABLE,= 0, > >>> - vma, vmf->address, fals= e); > >>> + folio =3D alloc_swap_folio(vmf); > >>> page =3D &folio->page; > >>> if (folio) { > >>> __folio_set_locked(folio); > >>> __folio_set_swapbacked(folio); > >>> > >>> + if (folio_test_large(folio)) { > >>> + nr_pages =3D folio_nr_pages(fol= io); > >>> + entry.val =3D ALIGN_DOWN(entry.= val, nr_pages); > >>> + } > >>> + > >>> + /* > >>> + * Prevent parallel swapin from proceed= ing with > >>> + * the cache flag. Otherwise, another t= hread may > >>> + * finish swapin first, free the entry,= and swapout > >>> + * reusing the same entry. It's undetec= table as > >>> + * pte_same() returns true due to entry= reuse. > >>> + */ > >>> + if (swapcache_prepare_nr(entry, nr_page= s)) { > >>> + /* Relax a bit to prevent rapid= repeated page faults */ > >>> + schedule_timeout_uninterruptibl= e(1); > >>> + goto out; > >>> + } > >>> + need_clear_cache =3D true; > >>> + > >>> if (mem_cgroup_swapin_charge_folio(foli= o, > >>> vma->vm_mm, GFP= _KERNEL, > >>> entry)) { > >>> ret =3D VM_FAULT_OOM; > >>> goto out_page; > >>> } > >>> - mem_cgroup_swapin_uncharge_swap(entry); > >>> + > >>> + for (swp_entry_t e =3D entry; e.val < e= ntry.val + nr_pages; e.val++) > >>> + mem_cgroup_swapin_uncharge_swap= (e); > >>> > >>> shadow =3D get_shadow_from_swap_cache(e= ntry); > >>> if (shadow) > >>> @@ -4118,6 +4257,42 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) > >>> */ > >>> vmf->pte =3D pte_offset_map_lock(vma->vm_mm, vmf->pmd, vmf->add= ress, > >>> &vmf->ptl); > >>> + > >>> + start_address =3D vmf->address; > >>> + start_pte =3D vmf->pte; > >>> + if (start_pte && folio_test_large(folio)) { > >>> + unsigned long nr =3D folio_nr_pages(folio); > >>> + unsigned long addr =3D ALIGN_DOWN(vmf->address, nr * PA= GE_SIZE); > >>> + pte_t *aligned_pte =3D vmf->pte - (vmf->address - addr)= / PAGE_SIZE; > >>> + > >>> + /* > >>> + * case 1: we are allocating large_folio, try to map it= as a whole > >>> + * iff the swap entries are still entirely mapped; > >>> + * case 2: we hit a large folio in swapcache, and all s= wap entries > >>> + * are still entirely mapped, try to map a large folio = as a whole. > >>> + * otherwise, map only the faulting page within the lar= ge folio > >>> + * which is swapcache > >>> + */ > >>> + if (!is_pte_range_contig_swap(aligned_pte, nr)) { > >>> + if (nr_pages > 1) /* ptes have changed for case= 1 */ > >>> + goto out_nomap; > >>> + goto check_pte; > >>> + } > >>> + > >>> + start_address =3D addr; > >>> + start_pte =3D aligned_pte; > >>> + /* > >>> + * the below has been done before swap_read_folio() > >>> + * for case 1 > >>> + */ > >>> + if (unlikely(folio =3D=3D swapcache)) { > >>> + nr_pages =3D nr; > >>> + entry.val =3D ALIGN_DOWN(entry.val, nr_pages); > >>> + page =3D &folio->page; > >>> + } > >>> + } > >>> + > >>> +check_pte: > >>> if (unlikely(!vmf->pte || !pte_same(ptep_get(vmf->pte), vmf->or= ig_pte))) > >>> goto out_nomap; > >>> > >>> @@ -4185,12 +4360,14 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) > >>> * We're already holding a reference on the page but haven't ma= pped it > >>> * yet. > >>> */ > >>> - swap_free(entry); > >>> + swap_nr_free(entry, nr_pages); > >>> if (should_try_to_free_swap(folio, vma, vmf->flags)) > >>> folio_free_swap(folio); > >>> > >>> - inc_mm_counter(vma->vm_mm, MM_ANONPAGES); > >>> - dec_mm_counter(vma->vm_mm, MM_SWAPENTS); > >>> + folio_ref_add(folio, nr_pages - 1); > >>> + add_mm_counter(vma->vm_mm, MM_ANONPAGES, nr_pages); > >>> + add_mm_counter(vma->vm_mm, MM_SWAPENTS, -nr_pages); > >>> + > >>> pte =3D mk_pte(page, vma->vm_page_prot); > >>> > >>> /* > >>> @@ -4200,14 +4377,14 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) > >>> * exclusivity. > >>> */ > >>> if (!folio_test_ksm(folio) && > >>> - (exclusive || folio_ref_count(folio) =3D=3D 1)) { > >>> + (exclusive || folio_ref_count(folio) =3D=3D nr_pages)) { > >>> if (vmf->flags & FAULT_FLAG_WRITE) { > >>> pte =3D maybe_mkwrite(pte_mkdirty(pte), vma); > >>> vmf->flags &=3D ~FAULT_FLAG_WRITE; > >>> } > >>> rmap_flags |=3D RMAP_EXCLUSIVE; > >>> } > >>> - flush_icache_page(vma, page); > >>> + flush_icache_pages(vma, page, nr_pages); > >>> if (pte_swp_soft_dirty(vmf->orig_pte)) > >>> pte =3D pte_mksoft_dirty(pte); > >>> if (pte_swp_uffd_wp(vmf->orig_pte)) > >>> @@ -4216,17 +4393,19 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) > >>> > >>> /* ksm created a completely new copy */ > >>> if (unlikely(folio !=3D swapcache && swapcache)) { > >>> - folio_add_new_anon_rmap(folio, vma, vmf->address); > >>> + folio_add_new_anon_rmap(folio, vma, start_address); > >>> folio_add_lru_vma(folio, vma); > >>> + } else if (!folio_test_anon(folio)) { > >>> + folio_add_new_anon_rmap(folio, vma, start_address); > >>> } else { > >>> - folio_add_anon_rmap_pte(folio, page, vma, vmf->address, > >>> + folio_add_anon_rmap_ptes(folio, page, nr_pages, vma, st= art_address, > >>> rmap_flags); > >>> } > >>> > >>> VM_BUG_ON(!folio_test_anon(folio) || > >>> (pte_write(pte) && !PageAnonExclusive(page))); > >>> - set_pte_at(vma->vm_mm, vmf->address, vmf->pte, pte); > >>> - arch_do_swap_page(vma->vm_mm, vma, vmf->address, pte, vmf->orig= _pte); > >>> + set_ptes(vma->vm_mm, start_address, start_pte, pte, nr_pages); > >>> + arch_do_swap_page(vma->vm_mm, vma, start_address, pte, vmf->ori= g_pte); > >>> > >>> folio_unlock(folio); > >>> if (folio !=3D swapcache && swapcache) { > >>> @@ -4243,6 +4422,9 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) > >>> } > >>> > >>> if (vmf->flags & FAULT_FLAG_WRITE) { > >>> + if (nr_pages > 1) > >>> + vmf->orig_pte =3D ptep_get(vmf->pte); > >>> + > >>> ret |=3D do_wp_page(vmf); > >>> if (ret & VM_FAULT_ERROR) > >>> ret &=3D VM_FAULT_ERROR; > >>> @@ -4250,14 +4432,14 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) > >>> } > >>> > >>> /* No need to invalidate - it was non-present before */ > >>> - update_mmu_cache_range(vmf, vma, vmf->address, vmf->pte, 1); > >>> + update_mmu_cache_range(vmf, vma, start_address, start_pte, nr_p= ages); > >>> unlock: > >>> if (vmf->pte) > >>> pte_unmap_unlock(vmf->pte, vmf->ptl); > >>> out: > >>> /* Clear the swap cache pin for direct swapin after PTL unlock = */ > >>> if (need_clear_cache) > >>> - swapcache_clear(si, entry); > >>> + swapcache_clear_nr(si, entry, nr_pages); > >>> if (si) > >>> put_swap_device(si); > >>> return ret; > >>> @@ -4273,7 +4455,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) > >>> folio_put(swapcache); > >>> } > >>> if (need_clear_cache) > >>> - swapcache_clear(si, entry); > >>> + swapcache_clear_nr(si, entry, nr_pages); > >>> if (si) > >>> put_swap_device(si); > >>> return ret; > >>> @@ -4309,15 +4491,7 @@ static struct folio *alloc_anon_folio(struct v= m_fault *vmf) > >>> if (unlikely(userfaultfd_armed(vma))) > >>> goto fallback; > >>> > >>> - /* > >>> - * Get a list of all the (large) orders below PMD_ORDER that ar= e enabled > >>> - * for this vma. Then filter out the orders that can't be alloc= ated over > >>> - * the faulting address and still be fully contained in the vma= . > >>> - */ > >>> - orders =3D thp_vma_allowable_orders(vma, vma->vm_flags, false, = true, true, > >>> - BIT(PMD_ORDER) - 1); > >>> - orders =3D thp_vma_suitable_orders(vma, vmf->address, orders); > >>> - > >>> + orders =3D get_alloc_folio_orders(vmf); > >>> if (!orders) > >>> goto fallback; > >>> Thanks Barry